优化

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/MarketingMgrController.java

@@ -240,7 +240,7 @@ public class MarketingMgrController extends BaseApiController {
         int newUserCount = marketingUserCodeService.count(new LambdaQueryWrapper<MarketingUserCode>()
                 .eq(MarketingUserCode::getMarketingId, id)
                 .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue())
-                .isNotNull(MarketingUserCode::getHelpUserId)
+                .eq(MarketingUserCode::getHelpUserId, -1)
                 .groupBy(MarketingUserCode::getUserId));
 
         marketingDataVO.setNewUserCount(newUserCount);

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

@@ -158,7 +158,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         int count = marketingUserCodeService.count(new LambdaQueryWrapper<MarketingUserCode>()
                 .eq(MarketingUserCode::getUserId, userId)
                 .eq(MarketingUserCode::getMarketingId, marketingId)
-                .isNull(MarketingUserCode::getHelpUserId));
+                .eq(MarketingUserCode::getHelpUserId, -1L));
         if (count > 0) {
             throw new ServiceException("您已经获取过抽奖码了");
         }
@@ -185,6 +185,8 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         marketingUserCode.setCode(code);
         // 设置用户
         marketingUserCode.setUserId(userId);
+        // -1为无人助力获取抽奖码
+        marketingUserCode.setHelpUserId(-1L);
         // 设置用户类型
         marketingUserCode.setUserType(UserTypeEnum.ORDINARY.getValue());
 
@@ -284,7 +286,7 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
             // 用户低阶抽奖码
             Set<String> userLowCodes = new HashSet<>();
             for (MarketingUserCode marketingUserCode : userCodeList) {
-                if (Objects.isNull(marketingUserCode.getHelpUserId())) {
+                if (marketingUserCode.getHelpUserId() == -1L) {
                     userLowCodes.add(marketingUserCode.getCode());
                 } else {
                     userCodes.add(marketingUserCode.getCode());