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

优化

See merge request quanshu/mp-server!540

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

@@ -1,15 +1,18 @@
 package com.qs.mp.web.controller.api.user;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.framework.security.handle.HostHolder;
 import com.qs.mp.user.domain.MarketingHitPrize;
+import com.qs.mp.user.domain.MarketingUserCode;
 import com.qs.mp.user.domain.param.UserMarketingHitPrizeQueryParam;
 import com.qs.mp.user.domain.vo.UserMarketingHitPrizeDetailVO;
 import com.qs.mp.user.domain.vo.UserMarketingHitPrizeListVO;
 import com.qs.mp.user.service.IMarketingHitPrizeService;
+import com.qs.mp.user.service.IMarketingUserCodeService;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
@@ -37,6 +40,9 @@ public class MarketingHitPrizeController extends BaseApiController {
     @Autowired
     private IMarketingHitPrizeService marketingHitPrizeService;
 
+    @Autowired
+    private IMarketingUserCodeService marketingUserCodeService;
+
     @Autowired
     private HostHolder hostHolder;
 
@@ -73,6 +79,16 @@ public class MarketingHitPrizeController extends BaseApiController {
 
         UserMarketingHitPrizeDetailVO userMarketingHitPrizeDetailVO = new UserMarketingHitPrizeDetailVO();
         userMarketingHitPrizeDetailVO.setIsHit(0);
+
+        // 判断是否参与了
+        int count = marketingUserCodeService.count(new LambdaQueryWrapper<MarketingUserCode>()
+                .eq(MarketingUserCode::getMarketingId, marketingId)
+                .eq(MarketingUserCode::getUserId, userId));
+        if (count == 0) {
+            userMarketingHitPrizeDetailVO.setIsHit(-1);
+            return AjaxResult.success(userMarketingHitPrizeDetailVO);
+        }
+
         if (Objects.nonNull(userId) && userId != 0) {
             QueryWrapper<MarketingHitPrize> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("t1.marketing_id",marketingId);

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserMarketingHitPrizeDetailVO.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @Data
 public class UserMarketingHitPrizeDetailVO {
 
-    @ApiModelProperty("是否中奖,0未中奖,1中奖")
+    @ApiModelProperty("是否中奖,-1未参与,0未中奖,1中奖")
     private Integer isHit;
 
     @ApiModelProperty("奖级")