首页数据看板

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

@@ -5,6 +5,7 @@ import com.wwdz.ch.admin.controller.AdminDashbordController;
 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.admin.service.SysFinanceService;
 import com.wwdz.ch.core.api.WxAppletApi;
 import com.wwdz.ch.core.consts.DashbordEnum;
 import com.wwdz.ch.core.consts.DistributionEnum;
@@ -19,6 +20,8 @@ import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.dao.dts.DtsUserDao;
 import com.wwdz.ch.db.dto.request.distribution.DistributorProfitRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.UserAccountDetailRequestDto;
+import com.xxdxxs.utils.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +55,9 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
     @Autowired
     DistributorProfitDao distributorProfitDao;
 
+    @Autowired
+    SysFinanceService sysFinanceService;
+
     @Override
     public Object info() {
 
@@ -118,13 +124,24 @@ 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));
+            //  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);
+
             dataPanelVo.setDistributionOrderData(distributionOrderData);
+
             return Result.success(dataPanelVo);
         } catch (Exception e) {
             logger.error("查询数据看板 error:{}", e);