From 15335f28e9c52b0eeafb622c2aec08d22ad4e52f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 17:59:26 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index c8a2f2e..94a93c5 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -432,6 +432,16 @@
                 merMemberPageDto.setSurpEndNum(999999999);
             }
         }
+        //今日到店用户
+        if(1 == merMemberPageDto.getIsTodayStore()){
+            List<Integer> data = remoteOrderService.countShopServicePerson(merMemberPageDto.getShopId()).getData();
+            merMemberPageDto.setUserIds(data);
+        }
+        //有未跟进的任务用户
+        if(1 == merMemberPageDto.getIsTask()){
+            List<Integer> data = remoteShopService.getMemberIngTotal(merMemberPageDto.getShopId()).getData();
+            merMemberPageDto.setUserIds(data);
+        }
         List<MerMemberPageVo> merMemberPageVoList = memberMapper.pageMerMember(page, merMemberPageDto);
         //处理活跃度返回
         if (merMemberPageVoList != null && !merMemberPageVoList.isEmpty()) {

--
Gitblit v1.7.1