Merge remote-tracking branch 'remotes/origin/202007131400' into develop

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderByConditionsRequestVo.java

@@ -23,11 +23,4 @@ public class QueryOrderByConditionsRequestVo {
     private int pageSize;
     @NotEmpty(message = "商户号 不能为空")
     private String partnerId;
-    @ApiModelProperty(value = "开始时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private String startDate;
-    @ApiModelProperty(value = "结束时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private String endDate;
-
 }

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderByConditionsResponseVo.java

@@ -21,7 +21,7 @@ public class QueryOrderByConditionsResponseVo {
     private String createTime;
     @ApiModelProperty(value = "积分")
     private BigDecimal settlementAmount;
-    @ApiModelProperty(value = "审核状态key")
+    @ApiModelProperty(value = "审核状态key 1=待审核 6=审核通过 7=审核未通过")
     private Integer orderState;
     @ApiModelProperty(value = "审核状态value")
     private String orderStateValue;

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

@@ -1382,7 +1382,7 @@ public class OrderServiceImpl implements Orderservice {
         req.setUserId(userInfo.getMemberId());
         req.setUserName(userInfo.getNickName());
         req.setPartnerId(vo.getPartnerId());
-        req.setImgUrl(vo.getImgUrl());
+        req.setImgUlr(vo.getImgUrl());
         req.setMobile(userInfo.getMobile());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderResp> result = orderSdkService.parking_v2_create(req, LogThreadLocal.getTrackingNo());
         if (Objects.isNull(result)) {
@@ -2417,16 +2417,9 @@ public class OrderServiceImpl implements Orderservice {
             OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
             BeanUtil.convertBean(queryOrderByConditionsRequestVo, orderConditionsReq);
             orderConditionsReq.setUserId(userId);
-            String startDateStr = queryOrderByConditionsRequestVo.getStartDate() + " 00:00:00";
-            String endDateStr = queryOrderByConditionsRequestVo.getEndDate() + " 23:59:59";
-            Date startDate = DateUtil.convert2Date(startDateStr, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
-            Date endDate = DateUtil.convert2Date(endDateStr, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
-            //验证日期是否符合范围
-            if (startDate.getTime() < DateUtil.addMonths(new Date(), -3).getTime()) {
-                return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "只能查询3个月内的订单信息");
-            }
-            orderConditionsReq.setStartTimestamp(startDate.getTime()/1000);
-            orderConditionsReq.setEndTimestamp(endDate.getTime()/1000);
+            Date now = new Date();
+            orderConditionsReq.setStartTimestamp(DateUtil.addMonths(now, -3).getTime()/1000);
+            orderConditionsReq.setEndTimestamp(now.getTime()/1000);
             BaseDownLoadResponse<List<OrderInfoReqs>> orderInfoReqs = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq,LogTreadLocal.getTrackingNo());
             if (!String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoReqs.getCode())) {
                 return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode());
@@ -2444,7 +2437,7 @@ public class OrderServiceImpl implements Orderservice {
                     String extInfo = orderBean.getExtInfo();
                     if(!StringUtil.isEmpty(extInfo)){
                         JSONObject jsonObject = JSONObject.parseObject(extInfo);
-                        imgUrl = String.valueOf(jsonObject.get("imgUrl"));
+                        imgUrl = String.valueOf(jsonObject.get("imgUlr"));
                     }
                     queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
                     queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderCreateReq.java

@@ -71,7 +71,7 @@ public class ParkingOrderCreateReq {
     /**
      * 发票图片
      */
-    private List<String> imgUrl;
+    private List<String> imgUlr;
     /**
      * 门店名称
      */