各导出增加时间校验

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

@@ -26,6 +26,7 @@ import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.domain.DeliveryCompany;
 import com.qs.mp.common.enums.*;
 import com.qs.mp.common.service.IDeliveryCompanyService;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.excel.DeliverOrderExcel;
@@ -47,6 +48,7 @@ import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 
 import org.apache.commons.lang3.StringUtils;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -329,6 +331,14 @@ public class ChannelOrderMgrController extends BaseApiController {
 	@PostMapping("/export")
 	@PreAuthorize("@ss.hasPermi('order:channel:export')")
 	public AjaxResult export(@RequestBody ChannelOrderQueryParam queryParam) {
+		Date startTime = queryParam.getStartTime();
+		Date endTime = queryParam.getEndTime();
+		if (startTime == null || endTime == null) {
+			return AjaxResult.error("导出数据必须设置日期范围");
+		}
+		if (DateUtils.diff(startTime, endTime) > 31) {
+			return AjaxResult.error("导出的数据不能超过31天");
+		}
 
 		List<ChannelOrderExcel> excelList = new ArrayList<ChannelOrderExcel>();
 		List<ChannelOrderVO> listAll = new ArrayList<ChannelOrderVO>();

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

@@ -22,6 +22,7 @@ import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.BusinessType;
 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.user.domain.MarketingHitPrize;
 import com.qs.mp.user.domain.MarketingUserCode;
 import com.qs.mp.user.service.IMarketingHitPrizeService;
@@ -40,6 +41,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;

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

@@ -14,6 +14,7 @@ import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.DeliverOrderStatusEnum;
 import com.qs.mp.common.enums.DeliverTypeEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.excel.DeliverOrderExcel;
@@ -226,10 +227,20 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 
 	@Log(title = "提货订单导出", businessType = BusinessType.EXPORT)
 	@PostMapping("/export")
-	@ApiOperation("替换订单导出")
+	@ApiOperation("提货订单导出")
 	@PreAuthorize("@ss.hasPermi('order:deliver:export')")
 	public AjaxResult export(@RequestBody UserDeliverOrderQueryParam queryParam) {
 
+		// 导出时间范围限制校验
+		Date startTime = queryParam.getStartTime();
+		Date endTime = queryParam.getEndTime();
+		if (startTime == null || endTime == null) {
+			return AjaxResult.error("导出数据必须设置日期范围");
+		}
+		if (DateUtils.diff(startTime, endTime) > 31) {
+			return AjaxResult.error("导出的数据不能超过31天");
+		}
+
 		List<DeliverOrderExcel> excelList = new ArrayList<DeliverOrderExcel>();
 		List<UserDeliverOrderVO> listAll = new ArrayList<UserDeliverOrderVO>();
 		// 首先查询要导出的数据总数

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

@@ -9,6 +9,7 @@ import com.qs.mp.admin.domain.vo.UserExchangeOrderVO;
 import com.qs.mp.admin.domain.vo.UserTicketOrderListVO;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.user.domain.UserExchangeOrder;
 import com.qs.mp.user.domain.UserTicketOrder;
 import com.qs.mp.user.service.IUserExchangeOrderService;
@@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -86,6 +88,16 @@ public class UserExchangeOrderMgrController extends BaseApiController {
     @PreAuthorize("@ss.hasPermi('order:exchange:export')")
     @ApiOperation("用户兑换订单导出")
     public AjaxResult export(@RequestBody UserExchangeOrderQueryParam userExchangeOrderQueryParam) {
+        // 导出时间范围限制校验
+        Date startTime = userExchangeOrderQueryParam.getStartTime();
+        Date endTime = userExchangeOrderQueryParam.getEndTime();
+        if (startTime == null || endTime == null) {
+            return AjaxResult.error("导出数据必须设置日期范围");
+        }
+        if (DateUtils.diff(startTime, endTime) > 31) {
+            return AjaxResult.error("导出的数据不能超过31天");
+        }
+
         QueryWrapper<UserExchangeOrder> queryWrapper = new QueryWrapper<>();
 
         // 封装条件

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

@@ -8,6 +8,7 @@ import com.qs.mp.admin.domain.vo.PrizeRecoveryListVO;
 import com.qs.mp.admin.service.IPrizeRecoveryService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.user.domain.excel.DeliverOrderExcel;
 import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -73,6 +75,17 @@ public class UserPrizeRecoveryMgrController extends BaseApiController {
     @PreAuthorize("@ss.hasPermi('business:recovery:export')")
     @ApiOperation("回收订单列表导出")
     public AjaxResult export(@RequestBody PrizeRecoveryListQueryParam prizeRecoveryListQueryParam) {
+
+        // 导出时间范围限制校验
+        Date startTime = prizeRecoveryListQueryParam.getStartTime();
+        Date endTime = prizeRecoveryListQueryParam.getEndTime();
+        if (startTime == null || endTime == null) {
+            return AjaxResult.error("导出数据必须设置日期范围");
+        }
+        if (DateUtils.diff(startTime, endTime) > 31) {
+            return AjaxResult.error("导出的数据不能超过31天");
+        }
+
         QueryWrapper<PrizeRecovery> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(prizeRecoveryListQueryParam.getTitle())) {
             queryWrapper.like("t1.title",prizeRecoveryListQueryParam.getTitle());

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

@@ -15,6 +15,7 @@ import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.PayOrderStatusEnum;
 import com.qs.mp.common.enums.TicketPrizeTypeEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.user.domain.UserTicketOrder;
 import com.qs.mp.user.domain.UserTicketOrderItem;
@@ -37,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -108,6 +110,17 @@ public class UserTicketOrderMgrController extends BaseApiController {
     @PreAuthorize("@ss.hasPermi('order:userTicket:export')")
     @ApiOperation("用户订单导出")
     public AjaxResult export(@RequestBody UserTicketOrderQueryParam userTicketOrderQueryParam) {
+
+        // 导出时间范围限制校验
+        Date startTime = userTicketOrderQueryParam.getStartTime();
+        Date endTime = userTicketOrderQueryParam.getEndTime();
+        if (startTime == null || endTime == null) {
+            return AjaxResult.error("导出数据必须设置日期范围");
+        }
+        if (DateUtils.diff(startTime, endTime) > 31) {
+            return AjaxResult.error("导出的数据不能超过31天");
+        }
+
         QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(userTicketOrderQueryParam.getBoxTitle())) {
             queryWrapper.like("t1.title", userTicketOrderQueryParam.getBoxTitle());