Merge remote-tracking branch 'origin/quanku_3.0' into quanku_3.0

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminDashbordServiceImpl.java

@@ -6,6 +6,7 @@ import com.wwdz.ch.admin.entity.request.DataPanelRequestDto;
 import com.wwdz.ch.admin.entity.vo.DataPanelVo;
 import com.wwdz.ch.admin.service.AdminDashbordService;
 import com.wwdz.ch.core.api.WxAppletApi;
+import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.consts.DashbordEnum;
 import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.type.Result;
@@ -128,10 +129,8 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             distributionOrderData.put("totalAmount", PriceUtil.convertPriceFenToYuan(distirbutionOrderDataStat.getTotalAmount()));
             distributionOrderData.put("totalOrderNum", distirbutionOrderDataStat.getTotalOrderNum());
             double distributorProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() * 0.03;
-            double channelDistributionProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() - distributorProfit;
-            distributionOrderData.put("totalProfit", PriceUtil.convertDoubleToString(channelDistributionProfit));
-            dataPanelVo.setDistributionOrderData(distributionOrderData);
-
+          //  double channelDistributionProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() - distributorProfit;
+          //  distributionOrderData.put("totalProfit", PriceUtil.convertDoubleToString(channelDistributionProfit));
 
             UserAccountDetailRequestDto userAccountDetailRequestDto = new UserAccountDetailRequestDto();
             userAccountDetailRequestDto.setStartCreateTime(DateUtils.parseString(startTimeStr));
@@ -139,7 +138,9 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             Result financeResult =sysFinanceService.findSystemBillIncomeDetail(userAccountDetailRequestDto);
             Map<String, Object> map = (Map<String, Object>) financeResult.getData();
             String totalAmount = (String) map.get("amount");
+            distributionOrderData.put("totalProfit", totalAmount);
 
+            dataPanelVo.setDistributionOrderData(distributionOrderData);
 
             return Result.success(dataPanelVo);
         } catch (Exception e) {