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

Dev

See merge request quanshu/mp-server!536

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

@@ -64,6 +64,9 @@ public class MarketingHitPrizeController extends BaseApiController {
 
     @PostMapping("/isHit/{marketingId}")
     @ApiOperation("判断当前用户是否中奖")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "成功", response = UserMarketingHitPrizeDetailVO.class)
+    )
     public AjaxResult isHit(@PathVariable("marketingId") Long marketingId) {
 
         Long userId = SecurityUtils.getLoginUser().getUserId();

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

@@ -322,16 +322,20 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         }
 
 
+        // 邀请码解码,被助力人id
+        Long helpedUserId = MarketingUtils.decodeInviteCode(inviteCode);
+        if (userId.equals(helpedUserId)) {
+            throw new ServiceException("不能助力自己哦");
+        }
+
         // 判断是否已经助力过
         int count = marketingUserCodeService.count(new LambdaQueryWrapper<MarketingUserCode>()
-                .eq(MarketingUserCode::getUserId, userId)
+                .eq(MarketingUserCode::getHelpUserId, userId)
                 .eq(MarketingUserCode::getMarketingId, marketingHelpParam.getMarketingId()));
         if (count > 0) {
             throw new ServiceException("您已经助力过了");
         }
 
-        // 邀请码解码,被助力人id
-        Long helpedUserId = MarketingUtils.decodeInviteCode(inviteCode);
 
         // 生成抽奖码
         String code = "";