获取已开始最近要开奖的营销活动

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

@@ -1,6 +1,7 @@
 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.admin.domain.Marketing;
 import com.qs.mp.admin.domain.MarketingAwards;
@@ -83,6 +84,30 @@ public class MarketingController extends BaseApiController {
     @Autowired
     private ISysUserService sysUserService;
 
+    @PostMapping("/recent")
+    @ApiOperation("获取已开始且最近要开奖的营销活动")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "OK", response = UserMarketingListVO.class)
+    )
+    public AjaxResult getRecentMarketing() {
+        Date nowDate = DateUtils.getNowDate();
+        LambdaQueryWrapper<Marketing> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Marketing::getIsOn, MarketingStatusEnum.ON.getValue());
+        queryWrapper.eq(Marketing::getTriggerStatus, 0);
+        queryWrapper.le(Marketing::getStartTime, nowDate);
+        queryWrapper.ge(Marketing::getEndTime, nowDate);
+        queryWrapper.orderByAsc(Marketing::getEndTime, Marketing::getStartTime);
+        List<Marketing> marketingList = marketingService.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(marketingList)) {
+            UserMarketingListVO userMarketingListVO = new UserMarketingListVO();
+            BeanUtils.copyProperties(marketingList.get(0), userMarketingListVO);
+            return success(userMarketingListVO);
+        }
+
+        return AjaxResult.success();
+    }
+
+
     @PostMapping("/userInfo/{inviteCode}")
     @ApiOperation("通过邀请码获取用户信息")
     @ApiResponses(

mp-framework/src/main/java/com/qs/mp/framework/config/SecurityConfig.java

@@ -144,7 +144,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                     "/api/v1/mp/user/marketing/list",
                     "/api/v1/mp/user/marketing/detail/*",
                     "/api/v1/mp/user/marketing/userInfo/*",
-                    "/api/v1/mp/user/exchange/category/listTree"
+                    "/api/v1/mp/user/exchange/category/listTree",
+                    "/api/v1/mp/user/marketing/recent"
                 ).permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()