Merge branch '【【华莱士】需求查看过去三个月的订单】'

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -726,7 +726,7 @@ public class OrderServiceImpl implements Orderservice {
                 if (queryOrderVo.getNeedInvoice() != null) {
                     queryOrderVo.setStartDate(DateUtil.convert2String(DateUtil.addMonths(new Date(), -2), "yyyy-MM-dd"));
                 } else {
-                    queryOrderVo.setStartDate(DateUtil.convert2String(DateUtil.addMonths(new Date(), -1), "yyyy-MM-dd"));
+                    queryOrderVo.setStartDate(DateUtil.convert2String(DateUtil.addMonths(new Date(), -3), "yyyy-MM-dd"));
                 }
             }
 
@@ -753,17 +753,13 @@ public class OrderServiceImpl implements Orderservice {
         if (endDate == null) {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "查询订单结束时间格式不正确");
         }
-        if (isQueryEs(queryOrderVo.getQueryOrderStatus()) && queryOrderEs) {
-            Date startDateEs = DateUtil.convert2Date(startDateStr, "yyyy-MM-dd");
-            Date endDateEs = DateUtil.convert2Date(new Date(), "yyyy-MM-dd");
-            if (startDateEs.getTime() < DateUtil.addMonths(endDateEs, -3).getTime()) {
-                return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "只能查询3个月内的订单信息");
-            }
-        } else {
-            if (startDate.getTime() < DateUtil.addMonths(new Date(), -3).getTime()) {
+
+        Date checkStartDate = DateUtil.convert2Date(startDateStr, "yyyy-MM-dd");
+        Date checkEndDate = DateUtil.convert2Date(new Date(), "yyyy-MM-dd");
+        if (checkStartDate.getTime() < DateUtil.addMonths(checkEndDate, -3).getTime()) {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "只能查询3个月内的订单信息");
         }
-        }
+
 
         String userId = userLoginInfoDto.getMemberId();
         QueryOrderDto queryOrderDto = BeanUtil.convertBean(queryOrderVo, QueryOrderDto::new);