fix: 拼团记录，虚拟成团数有误

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<Long> activityIds, Integer status, Long headId) {
+        return selectCount(new LambdaQueryWrapperX<CombinationRecordDO>()
+                .in(CombinationRecordDO::getActivityId, activityIds)
+                .eqIfPresent(CombinationRecordDO::getStatus, status)
+                .eqIfPresent(CombinationRecordDO::getHeadId, headId));
+    }
+
     /**
      * 查询用户拼团记录（DISTINCT 去重），也就是说查询会员表中的用户有多少人参与过拼团活动每个人只统计一次
      *

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<CombinationProductDO> getCombinationProductsByActivityId(Long activ
      */
     CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId);
 
+    /**
+     * 查询虚拟成团的拼团活动
+     *
+     * @return 拼团活动列表
+     */
+    List<CombinationActivityDO> getByVirtualGroup();
 }

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<CombinationActivityDO> getByVirtualGroup() {
+        return combinationActivityMapper.selectList(
+                CombinationActivityDO::getVirtualGroup, Boolean.TRUE
+        );
+    }
 }

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<CombinationActivityDO> activities = combinationActivityService.getByVirtualGroup();
+        if (CollUtil.isEmpty(activities)) {
+            return 0L;
+        }
+
+        List<Long> activityIds = convertList(activities, CombinationActivityDO::getId);
+        return combinationRecordMapper.selectCountByHeadAndStatusAndActivityIds(activityIds, status, headId);
     }
 
     @Override