Переглянути джерело

feat: 首页-统计 改成企微和个微

xdd 1 місяць тому
батько
коміт
8b01d83b88

+ 35 - 0
fs-service-system/src/main/java/com/fs/statis/dto/DealerAggregatedDTO.java

@@ -32,4 +32,39 @@ public class DealerAggregatedDTO implements Serializable {
      */
     private Long qwMemberNum;
 
+    /**
+     * 今日新增
+     */
+    private Long todayIncreaseUserNum;
+
+    /**
+     * 订单总数
+     */
+    private Long orderTotalNum;
+
+    /**
+     * 今日新增订单数
+     */
+    private Long todayOrderNum;
+
+    /**
+     * 收款总数
+     */
+    private Long recvTotalNum;
+
+    /**
+     * 今日收款总数
+     */
+    private Long recvTodayNum;
+
+    /**
+     * 商品总数
+     */
+    private Long goodsTotalNum;
+
+    /**
+     * 今日商品总数
+     */
+    private Long todayGoodsNum;
+
 }

+ 31 - 1
fs-service-system/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -8,6 +8,10 @@ import com.fs.statis.dto.*;
 import com.fs.statis.mapper.ConsumptionBalanceMapper;
 import com.fs.statis.service.IStatisticsService;
 import com.fs.statis.service.utils.TrendDataFiller;
+import com.fs.store.service.IFsStoreOrderService;
+import com.fs.store.service.IFsStorePaymentService;
+import com.fs.store.service.IFsStoreProductService;
+import com.fs.store.service.IFsUserService;
 import com.fs.store.service.cache.IFsUserCourseCacheService;
 import com.hc.openapi.tool.util.ObjectUtils;
 import com.hc.openapi.tool.util.StringUtils;
@@ -41,7 +45,17 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
     @Autowired
     private FsCourseTrafficLogMapper fsCourseTrafficLogMapper;
+    @Autowired
+    private IFsUserService userService;
+
+    @Autowired
+    private IFsStoreOrderService storeOrderService;
 
+    @Autowired
+    private IFsStorePaymentService paymentService;
+
+    @Autowired
+    private IFsStoreProductService productService;
 
     @Override
     public void dataOverviewTask() {
@@ -559,9 +573,25 @@ public class StatisticsServiceImpl implements IStatisticsService {
     }
 
 
+
     @Override
     public DealerAggregatedDTO dealerAggregated() {
-        return consumptionBalanceMapper.dealerAggregated();
+        Long dayUserCount=userService.selectFsUserCount(1,null);
+        Long storeOrderCount=storeOrderService.selectFsStoreOrderTotalCount(0,null);
+        Long dayStoreOrderCount=storeOrderService.selectFsStoreOrderTotalCount(1,null);
+        Long paymentCount=paymentService.selectFsStorePaymentCount(0,null);
+        Long dayPaymentCount=paymentService.selectFsStorePaymentCount(1,null);
+        Long productCount=productService.selectFsStoreProductCount(0);
+        Long dayProductCount=productService.selectFsStoreProductCount(1);
+        DealerAggregatedDTO dealerAggregatedDTO = consumptionBalanceMapper.dealerAggregated();
+        dealerAggregatedDTO.setTodayIncreaseUserNum(dayUserCount);
+        dealerAggregatedDTO.setOrderTotalNum(storeOrderCount);
+        dealerAggregatedDTO.setTodayOrderNum(dayStoreOrderCount);
+        dealerAggregatedDTO.setRecvTodayNum(paymentCount);
+        dealerAggregatedDTO.setRecvTodayNum(dayPaymentCount);
+        dealerAggregatedDTO.setGoodsTotalNum(productCount);
+        dealerAggregatedDTO.setTodayGoodsNum(dayProductCount);
+        return dealerAggregatedDTO;
     }
 
     @Override