Merge branch '202007131400' into qa

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

@@ -2419,7 +2419,7 @@ public class OrderServiceImpl implements Orderservice {
             OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
             BeanUtil.convertBean(queryOrderByConditionsRequestVo, orderConditionsReq);
             orderConditionsReq.setUserId(userId);
-            Date startDate = DateUtil.convert2Date(DateUtil.addDays(new Date(),-28), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            Date startDate = DateUtil.convert2Date("2020-08-01 00:00:00", DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
             orderConditionsReq.setStartTimestamp(startDate.getTime()/1000);
             orderConditionsReq.setEndTimestamp(new Date().getTime()/1000);
             BaseDownLoadResponse<List<OrderInfoReqs>> orderInfoReqs = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq,LogTreadLocal.getTrackingNo());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -201,5 +201,11 @@ public class InterfaceAddressConstant {
      */
     public static final String PARKING_V2_AFFIRM = "/parking/v2/affirm";
 
+    /**
+     * /parking/v2/cancel
+     * 审核不通过
+     */
+    public static final String PARKING_V2_CANCEL = "/parking/v2/cancel";
+
 
 }

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

+package com.freemud.application.sdk.api.ordercenter.request.carpark;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class ParkingOrderCancelReq {
+    private String orderCode;
+    private String operator;
+    private String cancelReason;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -6,6 +6,7 @@ import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressCons
 import com.freemud.application.sdk.api.ordercenter.enums.ResponseResultEnum;
 import com.freemud.application.sdk.api.ordercenter.request.*;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderAffirmReq;
+import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCancelReq;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.BatchQueryByCodesReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateFatherSonOrderReq;
@@ -792,5 +793,15 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * /parking/v2/cancel
+     * 审核不通过
+     */
+    public BaseResponse parking_v2_cancel(ParkingOrderCancelReq request, String trackingNo) {
+        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CANCEL,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+                });
+        return responseHandle(responseDTO);
+    }
 
 }