From 0ab1b864458f36b294933112824b10b13770915e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 21:12:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 6ac5722..5884fed 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
@@ -16,6 +16,7 @@
import com.ruoyi.order.domain.pojo.order.OrderGoods;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.mapper.order.OrderMapper;
+import com.ruoyi.order.mapper.order.UserServiceRecordMapper;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderGoodsService;
import com.ruoyi.order.service.order.OrderService;
@@ -85,6 +86,9 @@
@Resource
private RemoteActivityService remoteActivityService;
+
+ @Resource
+ private UserServiceRecordMapper userServiceRecordMapper;
/**
* @description: buyGoods
@@ -806,10 +810,18 @@
*/
@Override
public MerHomeShopTotalVo getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo) {
- Long shopId = merHomeShopTotalVo.getShopId();
- Integer todayShop = userServiceRecordService.countShopServicePerson(shopId);
- merHomeShopTotalVo.setTodayShop(todayShop);
- merHomeShopTotalVo = orderMapper.getMerHomeShopTotalVo(shopId);
+ List<Long> shopIds = merHomeShopTotalVo.getShopIds();
+ if (null != shopIds && shopIds.size() != 0) {
+ Integer todayShop = userServiceRecordMapper.countShopServicePersons(shopIds);
+ merHomeShopTotalVo = orderMapper.getMerHomeShopsTotalVo(shopIds);
+ merHomeShopTotalVo.setTodayShop(todayShop);
+ }else{
+ Long shopId = merHomeShopTotalVo.getShopId();
+ Integer todayShop = userServiceRecordService.countShopServicePerson(shopId);
+ merHomeShopTotalVo.setTodayShop(todayShop);
+ merHomeShopTotalVo = orderMapper.getMerHomeShopTotalVo(shopId);
+
+ }
return merHomeShopTotalVo;
}
--
Gitblit v1.7.1