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

优化

See merge request quanshu/mp-server!535

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

@@ -15,6 +15,7 @@ import com.qs.mp.common.enums.MarketingStatusEnum;
 import com.qs.mp.common.enums.UserTypeEnum;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.StringUtils;
+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.MarketingHelpParam;
@@ -66,6 +67,9 @@ public class MarketingController extends BaseApiController {
     @Autowired
     private IMarketingUserCodeService marketingUserCodeService;
 
+    @Autowired
+    private HostHolder hostHolder;
+
     @PostMapping("/help")
     @ApiOperation("活动助力")
     public AjaxResult help(@RequestBody MarketingHelpParam marketingHelpParam) {
@@ -90,13 +94,18 @@ public class MarketingController extends BaseApiController {
     }
 
 
-    @PostMapping("list")
+    @PostMapping("/list")
     @ApiOperation("获取营销活动列表")
     @ApiResponses(
             @ApiResponse(code = 200, message = "成功", response = UserMarketingListVO.class)
     )
     public TableDataInfo list(@Validated @RequestBody UserMarketingQueryParam userMarketingQueryParam) {
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+        // 获取用户 id
+        Long userId = 0L;
+
+        if (hostHolder.getUser() != null) {
+            userId = hostHolder.getUser().getUserId();
+        }
 
         startPage();
         LambdaQueryWrapper<Marketing> queryWrapper = new LambdaQueryWrapper<>();
@@ -116,13 +125,14 @@ public class MarketingController extends BaseApiController {
         List<UserMarketingListVO> userMarketingListVOList = new ArrayList<>();
         List<Marketing> list = marketingService.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(list)) {
+            Long finalUserId = userId;
             userMarketingListVOList = list.stream().map(marketing -> {
                 UserMarketingListVO userMarketingListVO = new UserMarketingListVO();
                 BeanUtils.copyProperties(marketing, userMarketingListVO);
                 if (userMarketingQueryParam.getTriggerStatus() == 1) {
                     int count = marketingHitPrizeService.count(new LambdaQueryWrapper<MarketingHitPrize>()
                             .eq(MarketingHitPrize::getMarketingId, marketing.getId())
-                            .eq(MarketingHitPrize::getUserId, userId));
+                            .eq(MarketingHitPrize::getUserId, finalUserId));
                     userMarketingListVO.setIsHit(count);
                 }
                 return userMarketingListVO;
@@ -138,7 +148,12 @@ public class MarketingController extends BaseApiController {
             @ApiResponse(code = 200, message = "成功", response = UserMarketingDetailVO.class)
     )
     public AjaxResult detail(@PathVariable("id") Long id) {
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+        // 获取用户 id
+        Long userId = 0L;
+
+        if (hostHolder.getUser() != null) {
+            userId = hostHolder.getUser().getUserId();
+        }
 
         Marketing marketing = marketingService.getById(id);
         if (Objects.isNull(marketing)) {