From 0b9e60f0bada4cc39187a9dd3c36bf37452f63de Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 18:58:10 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 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 ecff163..3a2ff61 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
@@ -435,13 +435,37 @@
//今日到店用户
if(null != merMemberPageDto.getIsTodayStore() && 1 == merMemberPageDto.getIsTodayStore()){
List<Integer> data = remoteOrderService.countShopServicePerson(merMemberPageDto.getShopId()).getData();
+ if(data.isEmpty()){
+ data.add(-1);
+ }
merMemberPageDto.setUserIds(data);
}
//有未跟进的任务用户
if(null != merMemberPageDto.getIsTask() && 1 == merMemberPageDto.getIsTask()){
List<Integer> data = remoteShopService.getMemberIngTotal(merMemberPageDto.getShopId()).getData();
+ if(data.isEmpty()){
+ data.add(-1);
+ }
merMemberPageDto.setUserIds(data);
}
+ //剩余周期人数
+ if(null != merMemberPageDto.getResiduePeriod() && 1 == merMemberPageDto.getResiduePeriod()){
+ Set<Long> data = remoteOrderService.getConsumerGoodsResidueUserId(merMemberPageDto.getShopId(), 1).getData();
+ List<Integer> collect = data.stream().map(s -> Integer.valueOf(s.intValue())).collect(Collectors.toList());
+ if(collect.isEmpty()){
+ collect.add(-1);
+ }
+ merMemberPageDto.setUserIds(collect);
+ }
+ //剩余体验人数
+ if(null != merMemberPageDto.getResidueExperience() && 1 == merMemberPageDto.getResidueExperience()){
+ Set<Long> data = remoteOrderService.getConsumerGoodsResidueUserId(merMemberPageDto.getShopId(), 3).getData();
+ List<Integer> collect = data.stream().map(s -> Integer.valueOf(s.intValue())).collect(Collectors.toList());
+ if(collect.isEmpty()){
+ collect.add(-1);
+ }
+ merMemberPageDto.setUserIds(collect);
+ }
List<MerMemberPageVo> merMemberPageVoList = memberMapper.pageMerMember(page, merMemberPageDto);
//处理活跃度返回
if (merMemberPageVoList != null && !merMemberPageVoList.isEmpty()) {
--
Gitblit v1.7.1