From bed08f0be1a6eafc07a35bc0b4169e4eb78ac762 Mon Sep 17 00:00:00 2001 From: lb <284634275@qq.com> Date: Thu, 12 Dec 2024 10:59:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E6=8B=BC=E5=9B=A2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E8=99=9A=E6=8B=9F=E6=88=90=E5=9B=A2=E6=95=B0=E6=9C=89?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combination/CombinationRecordMapper.java | 16 ++++++++++++++++ .../combination/CombinationActivityService.java | 6 ++++++ .../CombinationActivityServiceImpl.java | 6 ++++++ .../CombinationRecordServiceImpl.java | 14 +++++++++++++- 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java index 04c1c6157e..52ffbae2d5 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.ibatis.annotations.Mapper; +import javax.validation.constraints.NotEmpty; import java.time.LocalDateTime; import java.util.Collection; import java.util.Collections; @@ -123,6 +124,21 @@ default Long selectCountByHeadAndStatusAndVirtualGroup(Integer status, Boolean v .eqIfPresent(CombinationRecordDO::getHeadId, headId)); } + /** + * 查询指定活动编号数组，指定状态，指定团长编号的记录数 + * + * @param activityIds 活动编号数组 + * @param status 状态 + * @param headId 团长编号 + * @return + */ + default Long selectCountByHeadAndStatusAndActivityIds(@NotEmpty Collection activityIds, Integer status, Long headId) { + return selectCount(new LambdaQueryWrapperX() + .in(CombinationRecordDO::getActivityId, activityIds) + .eqIfPresent(CombinationRecordDO::getStatus, status) + .eqIfPresent(CombinationRecordDO::getHeadId, headId)); + } + /** * 查询用户拼团记录（DISTINCT 去重），也就是说查询会员表中的用户有多少人参与过拼团活动每个人只统计一次 * diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java index 7adefdd035..4c6b93614b 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java @@ -124,4 +124,10 @@ default List getCombinationProductsByActivityId(Long activ */ CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId); + /** + * 查询虚拟成团的拼团活动 + * + * @return 拼团活动列表 + */ + List getByVirtualGroup(); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java index cefeeffd0e..0c27b419d8 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java @@ -240,4 +240,10 @@ public CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId) { return combinationActivityMapper.selectBySpuIdAndStatusAndNow(spuId, CommonStatusEnum.ENABLE.getStatus()); } + @Override + public List getByVirtualGroup() { + return combinationActivityMapper.selectList( + CombinationActivityDO::getVirtualGroup, Boolean.TRUE + ); + } } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java index 8f81e25464..531f060f4b 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java @@ -252,7 +252,19 @@ public CombinationValidateJoinRespDTO validateJoinCombination(Long userId, Long @Override public Long getCombinationRecordCount(@Nullable Integer status, @Nullable Boolean virtualGroup, @Nullable Long headId) { - return combinationRecordMapper.selectCountByHeadAndStatusAndVirtualGroup(status, virtualGroup, headId); + // virtualGroup 为 null，或者为 false 的时候，走原流程 + if (virtualGroup == null || !virtualGroup) { + return combinationRecordMapper.selectCountByHeadAndStatusAndVirtualGroup(status, virtualGroup, headId); + } + + // virtualGroup 为 true 的时候，查询虚拟成团的数量 + List activities = combinationActivityService.getByVirtualGroup(); + if (CollUtil.isEmpty(activities)) { + return 0L; + } + + List activityIds = convertList(activities, CombinationActivityDO::getId); + return combinationRecordMapper.selectCountByHeadAndStatusAndActivityIds(activityIds, status, headId); } @Override From f063914293f3f974c986c4d8634691b3d3754212 Mon Sep 17 00:00:00 2001 From: lb <284634275@qq.com> Date: Fri, 13 Dec 2024 11:17:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E6=8B=BC=E5=9B=A2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E8=99=9A=E6=8B=9F=E6=88=90=E5=9B=A2=E6=95=B0=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=E3=80=82=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?service=E4=B8=8D=E8=BF=9B=E8=A1=8Cdao=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/combination/CombinationActivityMapper.java | 5 +++++ .../service/combination/CombinationActivityServiceImpl.java | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java index df909a67c2..93342a2b12 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java @@ -44,4 +44,9 @@ default CombinationActivityDO selectBySpuIdAndStatusAndNow(Long spuId, Integer s .gt(CombinationActivityDO::getEndTime, now)); // 开始时间 < now < 结束时间，也就是说获取指定时间段的活动 } + default List selectByVirtualGroup(){ + return selectList( + CombinationActivityDO::getVirtualGroup, Boolean.TRUE + ); + } } \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java index 0c27b419d8..d851c9e2d1 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java @@ -242,8 +242,6 @@ public CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId) { @Override public List getByVirtualGroup() { - return combinationActivityMapper.selectList( - CombinationActivityDO::getVirtualGroup, Boolean.TRUE - ); + return combinationActivityMapper.selectByVirtualGroup(); } } From dc0e3d917da453f72765378cc7c549fc41a4450b Mon Sep 17 00:00:00 2001 From: lb <284634275@qq.com> Date: Mon, 16 Dec 2024 20:14:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"fix:=20=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E8=99=9A=E6=8B=9F=E6=88=90=E5=9B=A2?= =?UTF-8?q?=E6=95=B0=E6=9C=89=E8=AF=AF=E3=80=82=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8Cservice=E4=B8=8D=E8=BF=9B=E8=A1=8Cdao?= =?UTF-8?q?=E6=93=8D=E4=BD=9C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f063914293f3f974c986c4d8634691b3d3754212. --- .../dal/mysql/combination/CombinationActivityMapper.java | 5 ----- .../service/combination/CombinationActivityServiceImpl.java | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java index 93342a2b12..df909a67c2 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java @@ -44,9 +44,4 @@ default CombinationActivityDO selectBySpuIdAndStatusAndNow(Long spuId, Integer s .gt(CombinationActivityDO::getEndTime, now)); // 开始时间 < now < 结束时间，也就是说获取指定时间段的活动 } - default List selectByVirtualGroup(){ - return selectList( - CombinationActivityDO::getVirtualGroup, Boolean.TRUE - ); - } } \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java index d851c9e2d1..0c27b419d8 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java @@ -242,6 +242,8 @@ public CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId) { @Override public List getByVirtualGroup() { - return combinationActivityMapper.selectByVirtualGroup(); + return combinationActivityMapper.selectList( + CombinationActivityDO::getVirtualGroup, Boolean.TRUE + ); } } From e8f5d0b2ee337d585b110baae1cdcb7e41936dc4 Mon Sep 17 00:00:00 2001 From: lb <284634275@qq.com> Date: Mon, 16 Dec 2024 20:14:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?Revert=20"fix:=20=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E8=99=9A=E6=8B=9F=E6=88=90=E5=9B=A2?= =?UTF-8?q?=E6=95=B0=E6=9C=89=E8=AF=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bed08f0be1a6eafc07a35bc0b4169e4eb78ac762. --- .../combination/CombinationRecordMapper.java | 16 ---------------- .../combination/CombinationActivityService.java | 6 ------ .../CombinationActivityServiceImpl.java | 6 ------ .../CombinationRecordServiceImpl.java | 14 +------------- 4 files changed, 1 insertion(+), 41 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java index 52ffbae2d5..04c1c6157e 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.ibatis.annotations.Mapper; -import javax.validation.constraints.NotEmpty; import java.time.LocalDateTime; import java.util.Collection; import java.util.Collections; @@ -124,21 +123,6 @@ default Long selectCountByHeadAndStatusAndVirtualGroup(Integer status, Boolean v .eqIfPresent(CombinationRecordDO::getHeadId, headId)); } - /** - * 查询指定活动编号数组，指定状态，指定团长编号的记录数 - * - * @param activityIds 活动编号数组 - * @param status 状态 - * @param headId 团长编号 - * @return - */ - default Long selectCountByHeadAndStatusAndActivityIds(@NotEmpty Collection activityIds, Integer status, Long headId) { - return selectCount(new LambdaQueryWrapperX() - .in(CombinationRecordDO::getActivityId, activityIds) - .eqIfPresent(CombinationRecordDO::getStatus, status) - .eqIfPresent(CombinationRecordDO::getHeadId, headId)); - } - /** * 查询用户拼团记录（DISTINCT 去重），也就是说查询会员表中的用户有多少人参与过拼团活动每个人只统计一次 * diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java index 4c6b93614b..7adefdd035 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java @@ -124,10 +124,4 @@ default List getCombinationProductsByActivityId(Long activ */ CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId); - /** - * 查询虚拟成团的拼团活动 - * - * @return 拼团活动列表 - */ - List getByVirtualGroup(); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java index 0c27b419d8..cefeeffd0e 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java @@ -240,10 +240,4 @@ public CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId) { return combinationActivityMapper.selectBySpuIdAndStatusAndNow(spuId, CommonStatusEnum.ENABLE.getStatus()); } - @Override - public List getByVirtualGroup() { - return combinationActivityMapper.selectList( - CombinationActivityDO::getVirtualGroup, Boolean.TRUE - ); - } } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java index 531f060f4b..8f81e25464 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java @@ -252,19 +252,7 @@ public CombinationValidateJoinRespDTO validateJoinCombination(Long userId, Long @Override public Long getCombinationRecordCount(@Nullable Integer status, @Nullable Boolean virtualGroup, @Nullable Long headId) { - // virtualGroup 为 null，或者为 false 的时候，走原流程 - if (virtualGroup == null || !virtualGroup) { - return combinationRecordMapper.selectCountByHeadAndStatusAndVirtualGroup(status, virtualGroup, headId); - } - - // virtualGroup 为 true 的时候，查询虚拟成团的数量 - List activities = combinationActivityService.getByVirtualGroup(); - if (CollUtil.isEmpty(activities)) { - return 0L; - } - - List activityIds = convertList(activities, CombinationActivityDO::getId); - return combinationRecordMapper.selectCountByHeadAndStatusAndActivityIds(activityIds, status, headId); + return combinationRecordMapper.selectCountByHeadAndStatusAndVirtualGroup(status, virtualGroup, headId); } @Override From cbdc275f38605ac30befe5f921985abda830284d Mon Sep 17 00:00:00 2001 From: lb <284634275@qq.com> Date: Mon, 16 Dec 2024 20:18:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E6=8B=BC=E5=9B=A2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E8=99=9A=E6=8B=9F=E6=88=90=E5=9B=A2=E6=95=B0=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=E3=80=82=E7=BB=9F=E8=AE=A1=E7=AD=96=E7=95=A5=EF=BC=9A?= =?UTF-8?q?distinct(head=5Fid),=20where=20virtual=5Fgroup=20=3D=20true?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/combination/CombinationRecordMapper.java | 10 ++++++++++ .../combination/CombinationRecordServiceImpl.java | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java index 04c1c6157e..45d48ecc20 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java @@ -123,6 +123,16 @@ default Long selectCountByHeadAndStatusAndVirtualGroup(Integer status, Boolean v .eqIfPresent(CombinationRecordDO::getHeadId, headId)); } + /** + * 查询虚拟成团的记录数，先按head_id分组，然后再count + * @return + */ + default Long selectCountByVirtualGroupTrue(){ + return selectCount(new QueryWrapper() + .select("DISTINCT(head_id)") + .eq("virtual_group", true)); + } + /** * 查询用户拼团记录（DISTINCT 去重），也就是说查询会员表中的用户有多少人参与过拼团活动每个人只统计一次 * diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java index 8f81e25464..15057cdcf0 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java @@ -252,7 +252,13 @@ public CombinationValidateJoinRespDTO validateJoinCombination(Long userId, Long @Override public Long getCombinationRecordCount(@Nullable Integer status, @Nullable Boolean virtualGroup, @Nullable Long headId) { - return combinationRecordMapper.selectCountByHeadAndStatusAndVirtualGroup(status, virtualGroup, headId); + // virtualGroup 为 null，或者为 false 的时候，走原流程 + if (virtualGroup == null || !virtualGroup) { + return combinationRecordMapper.selectCountByHeadAndStatusAndVirtualGroup(status, virtualGroup, headId); + } + + // virtualGroup 为 true 的时候，查询虚拟成团的数量 + return combinationRecordMapper.selectCountByVirtualGroupTrue(); } @Override From f8e388be0056782d1168131c139bdee62fcea73f Mon Sep 17 00:00:00 2001 From: lb <284634275@qq.com> Date: Sun, 29 Dec 2024 18:28:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E6=8B=BC=E5=9B=A2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E8=99=9A=E6=8B=9F=E6=88=90=E5=9B=A2=E6=95=B0=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=E3=80=82=E7=BB=9F=E8=AE=A1=E7=AD=96=E7=95=A5=EF=BC=9A?= =?UTF-8?q?distinct(head=5Fid),=20where=20virtual=5Fgroup=20=3D=20true?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/combination/CombinationRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationRecordController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationRecordController.java index 45ad4e02d1..bce94885e7 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationRecordController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationRecordController.java @@ -63,7 +63,7 @@ public CommonResult getCombinationRecordSummary() { summaryVO.setSuccessCount(combinationRecordService.getCombinationRecordCount( // 获取成团记录 CombinationRecordStatusEnum.SUCCESS.getStatus(), null, CombinationRecordDO.HEAD_ID_GROUP)); summaryVO.setVirtualGroupCount(combinationRecordService.getCombinationRecordCount(// 获取虚拟成团记录 - null, Boolean.TRUE, CombinationRecordDO.HEAD_ID_GROUP)); + null, Boolean.TRUE, null)); return success(summaryVO); }