Merge branch 'feature/2020/09/07-1.9.38-自主积分新增撤单功能-张志恒'

# Conflicts:
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2972,6 +2972,10 @@ public class OrderSdkAdapter {
                 name ="审核未通过";
                 break;
             }
+            case 8: {
+                name ="撤单";
+                break;
+            }
         }
         return name;
     }

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

@@ -218,5 +218,12 @@ public class InterfaceAddressConstant {
      */
     public static final String UPDATE_PICKUP_GOODNO = "/order/v2/updatePickUpGoodNo";
 
+    /**
+     * /parking/v2/revoke
+     * 撤单
+     */
+    public static final String PARKING_V2_REVOKE = "/parking/v2/revoke";
+
+
 
 }

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

@@ -117,5 +117,7 @@ public class OrderConditionsReq {
 
     //应用ID
     private String appId;
+    //是否删除
+    private Integer isDeleted;
 
 }

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

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

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

@@ -11,6 +11,7 @@ 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.carpark.ParkingOrderRevokeReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.BatchQueryByCodesReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateFatherSonOrderReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
@@ -864,4 +865,15 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * /parking/v2/revoke
+     * 撤单
+     */
+    public BaseResponse parkingOrderRevoke(ParkingOrderRevokeReq request, String trackingNo) {
+        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_REVOKE,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
 }