From 1789718f58e3374ce85357524ef80a84f3d70d6f Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 25 六月 2023 18:36:01 +0800
Subject: [PATCH] 商户端统计

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 7298a75..9f8b9bf 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -17,6 +17,7 @@
 import com.ruoyi.order.service.order.ConsumerGoodsService;
 import com.ruoyi.order.service.order.OrderGoodsService;
 import com.ruoyi.common.security.utils.CodeFactoryUtil;
+import com.ruoyi.order.service.order.UserServiceRecordService;
 import com.ruoyi.system.api.domain.dto.*;
 import com.ruoyi.system.api.domain.vo.*;
 import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
@@ -75,6 +76,10 @@
 
     @Resource
     private RemoteConfigService remoteConfigService;
+
+    @Resource
+    private UserServiceRecordService userServiceRecordService;
+
 
 
     /**
@@ -508,16 +513,9 @@
     @Override
     public MerHomeShopTotalVo getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo) {
         Long shopId = merHomeShopTotalVo.getShopId();
-        Integer todayShop = 0;
-        Integer unHandleOrder = 0;
-        BigDecimal shopTurnover = new BigDecimal("0.00");
-        Integer cycleSurp = 0;
-        Integer explorationSurp = 0;
+        Integer todayShop = userServiceRecordService.countShopServicePerson(shopId);
         merHomeShopTotalVo.setTodayShop(todayShop);
-        merHomeShopTotalVo.setUnHandleOrder(unHandleOrder);
-        merHomeShopTotalVo.setShopTurnover(shopTurnover);
-        merHomeShopTotalVo.setCycleSurp(cycleSurp);
-        merHomeShopTotalVo.setExplorationSurp(explorationSurp);
+        merHomeShopTotalVo = orderMapper.getMerHomeShopTotalVo(shopId);
         return merHomeShopTotalVo;
     }
 

--
Gitblit v1.7.1