Merge branch 'mp-server-test' into 'master'

Mp server test

See merge request quanshu/mp-server!668

mp-quartz/src/main/java/com/qs/mp/quartz/task/MarketingTask.java

@@ -83,10 +83,12 @@ public class MarketingTask {
                 // 开奖
                 marketingService.lottery(marketing);
 
-                // 获取所有的参与用户
+                // 获取所有的参与用户的用户id去重
                 List<MarketingUserCode> userCodeList = marketingUserCodeService.list(new LambdaQueryWrapper<MarketingUserCode>()
+                        .select(MarketingUserCode::getUserId)
                         .eq(MarketingUserCode::getMarketingId, marketing.getId())
-                        .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue()));
+                        .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue())
+                        .groupBy(MarketingUserCode::getUserId));
                 for (MarketingUserCode marketingUserCode : userCodeList) {
                     // 发送开奖订阅通知
                     wxSubscribeMessage.sendMarketingLottery(marketingUserCode.getUserId(), marketing);
@@ -117,9 +119,11 @@ public class MarketingTask {
             return;
         }
 
-        // 获取所有参与过活动的普通用户
+        // 获取所有参与过活动的普通用户根据用户id去重
         List<MarketingUserCode> userCodeList = marketingUserCodeService.list(new LambdaQueryWrapper<MarketingUserCode>()
-                .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue()));
+                .select(MarketingUserCode::getUserId)
+                .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue())
+                .groupBy(MarketingUserCode::getUserId));
         if (CollectionUtils.isEmpty(userCodeList)) {
             return;
         }

mp-service/src/main/java/com/qs/mp/admin/service/impl/MarketingServiceImpl.java

@@ -189,7 +189,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         int realNum = marketingUserCodeService.countRealUserNumByMarketingId(marketing.getId());
         // 获取最新活动信息
         marketing.setRealNum(realNum);
-        int randomNum = (int) 1 + (int) (Math.random() * 10);
+        int randomNum = (int) 1 + (int) (Math.random() * 3);
         marketing.setFakeNum(marketing.getFakeNum() + randomNum);
         // 更新活动参与人数
         boolean rtn = this.updateById(marketing);
@@ -470,7 +470,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
 
         // 获取最新活动信息
         marketing.setRealNum(realNum);
-        int randomNum = (int) 1 + (int) (Math.random() * 10);
+        int randomNum = (int) 1 + (int) (Math.random() * 3);
         marketing.setFakeNum(marketing.getFakeNum() + randomNum);
         // 更新活动参与人数
         boolean rtn = this.updateById(marketing);