From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index ab3fdc2..ac16539 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -1331,16 +1331,16 @@
         MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
         merHomeShopTotalVo.setShopId(shopId);
         // 通过远程订单服务获取商店总览信息
-        //MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
+        MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
         // 获取商店任务计数
         Integer taskCount = memberTaskService.getMemberIngTotal(shopId);
         // 设置员工商店信息对象的属性
         staffShopInfoGetVo.setTodayReservation(0);
-        //staffShopInfoGetVo.setUnHandleOrder(orderVo.getUnHandleOrder());
+        staffShopInfoGetVo.setUnHandleOrder(orderVo.getUnHandleOrder());
         staffShopInfoGetVo.setShopTask(taskCount);
-        //staffShopInfoGetVo.setShopTurnover(orderVo.getShopTurnover());
-        //staffShopInfoGetVo.setCycleSurp(orderVo.getCycleSurp());
-        //staffShopInfoGetVo.setExplorationSurp(orderVo.getExplorationSurp());
+        staffShopInfoGetVo.setShopTurnover(orderVo.getShopTurnover());
+        staffShopInfoGetVo.setCycleSurp(orderVo.getCycleSurp());
+        staffShopInfoGetVo.setExplorationSurp(orderVo.getExplorationSurp());
         staffShopInfoGetVo.setShopId(shopId);
         staffShopInfoGetVo.setShopName(shop.getShopName());
         staffShopInfoGetVo.setShopType(shop.getShopType());

--
Gitblit v1.7.1