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

已经开奖的活动列表增加时间过滤

See merge request quanshu/mp-server!784

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

@@ -1,5 +1,6 @@
 package com.qs.mp.web.controller.api.user;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -39,6 +40,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import java.time.LocalDateTime;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -246,7 +248,6 @@ public class MarketingController extends BaseApiController {
         return AjaxResult.success("邀请码生成成功",MarketingUtils.generateInviteCode(userId));
     }
 
-
     @PostMapping("/list")
     @ApiOperation("获取营销活动列表")
     @ApiResponses(
@@ -273,6 +274,10 @@ public class MarketingController extends BaseApiController {
             queryWrapper.gt(Marketing::getEndTime, now);
             queryWrapper.orderByAsc(Marketing::getEndTime, Marketing::getStartTime);
         }else if(userMarketingQueryParam.getTriggerStatus() == 1) {
+            // 过滤30天之前的
+            LocalDateTime localDateTime = LocalDateTimeUtil.now().minusDays(30);
+            queryWrapper.ge(Marketing::getEndTime, localDateTime);
+
             // 开奖的排序
             queryWrapper.orderByDesc(Marketing::getEndTime);
         }