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

Dev

See merge request quanshu/mp-server!692

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

@@ -336,7 +336,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 		if (startTime == null || endTime == null) {
 			return AjaxResult.error("导出数据必须设置日期范围");
 		}
-		if (DateUtils.diff(startTime, endTime) > 31) {
+		if (DateUtils.diff(startTime, endTime) > 30) {
 			return AjaxResult.error("导出的数据不能超过31天");
 		}
 

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

@@ -237,7 +237,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		if (startTime == null || endTime == null) {
 			return AjaxResult.error("导出数据必须设置日期范围");
 		}
-		if (DateUtils.diff(startTime, endTime) > 31) {
+		if (DateUtils.diff(startTime, endTime) > 30) {
 			return AjaxResult.error("导出的数据不能超过31天");
 		}
 

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

@@ -94,7 +94,7 @@ public class UserExchangeOrderMgrController extends BaseApiController {
         if (startTime == null || endTime == null) {
             return AjaxResult.error("导出数据必须设置日期范围");
         }
-        if (DateUtils.diff(startTime, endTime) > 31) {
+        if (DateUtils.diff(startTime, endTime) > 30) {
             return AjaxResult.error("导出的数据不能超过31天");
         }
 

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

@@ -82,7 +82,7 @@ public class UserPrizeRecoveryMgrController extends BaseApiController {
         if (startTime == null || endTime == null) {
             return AjaxResult.error("导出数据必须设置日期范围");
         }
-        if (DateUtils.diff(startTime, endTime) > 31) {
+        if (DateUtils.diff(startTime, endTime) > 30) {
             return AjaxResult.error("导出的数据不能超过31天");
         }
 

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

@@ -117,7 +117,7 @@ public class UserTicketOrderMgrController extends BaseApiController {
         if (startTime == null || endTime == null) {
             return AjaxResult.error("导出数据必须设置日期范围");
         }
-        if (DateUtils.diff(startTime, endTime) > 31) {
+        if (DateUtils.diff(startTime, endTime) > 30) {
             return AjaxResult.error("导出的数据不能超过31天");
         }
 
@@ -191,6 +191,17 @@ public class UserTicketOrderMgrController extends BaseApiController {
     @PreAuthorize("@ss.hasPermi('order:userTicket:ticketExport')")
     @ApiOperation("销售订单盲票导出")
     public AjaxResult ticketExport(@RequestBody UserTicketOrderQueryParam userTicketOrderQueryParam) {
+
+        // 导出时间范围限制校验
+        Date startTime = userTicketOrderQueryParam.getStartTime();
+        Date endTime = userTicketOrderQueryParam.getEndTime();
+        if (startTime == null || endTime == null) {
+            return AjaxResult.error("导出数据必须设置日期范围");
+        }
+        if (DateUtils.diff(startTime, endTime) > 30) {
+            return AjaxResult.error("导出的数据不能超过31天");
+        }
+
         QueryWrapper<UserTicketOrderItem> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(userTicketOrderQueryParam.getBoxTitle())) {
             queryWrapper.like("t2.title", userTicketOrderQueryParam.getBoxTitle());