查询团购信息2

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

@@ -124,24 +124,13 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
             distirbutionOrderDto.setEndCreateTime(endTime);
             OrderDataStat distirbutionOrderDataStat = distributorProfitDao.countOrderData(distirbutionOrderDto);
 
-
             Map<String, Object> distributionOrderData = new HashMap<>();
             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));
-
-            UserAccountDetailRequestDto userAccountDetailRequestDto = new UserAccountDetailRequestDto();
-            userAccountDetailRequestDto.setStartCreateTime(DateUtils.parseString(startTimeStr));
-            userAccountDetailRequestDto.setEndCreateTime(DateUtils.parseString(endTimeStr));
-            Result financeResult =sysFinanceService.findSystemBillIncomeDetail(userAccountDetailRequestDto);
-            Map<String, Object> map = (Map<String, Object>) financeResult.getData();
-            String totalAmount = (String) map.get("amount");
-            distributionOrderData.put("totalProfit", totalAmount);
-
+            double channelDistributionProfit = distirbutionOrderDataStat.getTotalAmount().doubleValue() - distributorProfit;
+            distributionOrderData.put("totalProfit", PriceUtil.convertDoubleToString(channelDistributionProfit));
             dataPanelVo.setDistributionOrderData(distributionOrderData);
-
             return Result.success(dataPanelVo);
         } catch (Exception e) {
             logger.error("查询数据看板 error:{}", e);