Merge branch 'feature/1.9.27-停车费订单sdk-20200612-dingkai' into develop

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

@@ -1323,6 +1323,9 @@ public class OrderSdkAdapter {
             case "fmwd":
                 orderClientType = 25;
                 break;
+            case "parking":
+                orderClientType = 99;
+                break;
             default:
                 orderClientType = OrderClientType.SAAS.getIndex();
                 break;
@@ -1372,6 +1375,9 @@ public class OrderSdkAdapter {
             case 25:
                 name = "fmwd";
                 break;
+            case 99:
+                name = "parking";
+                break;
             default:
                 name = orderClientType.toString();
                 break;
@@ -1419,6 +1425,9 @@ public class OrderSdkAdapter {
             case 25:
                 name = "非码微店";
                 break;
+            case 99:
+                name = "农工商停车";
+                break;
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java

@@ -39,6 +39,8 @@ public enum OrderSourceType {
     SAASMALL("saasmall", "微商城"),
 
     APP("app", "APP"),
+
+    PARKING("parking", "农工商停车"),
     ;
 
     private String code;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java

@@ -35,6 +35,7 @@ public enum OrderClientType {
     KOUBEI(22, "口碑"),
     SAASMALL(23, "微商城"),
     FMWD(25, "非码微店"),
+    PARKING(99 , "农工商停车"),
     ;
 
 

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

@@ -14,6 +14,8 @@ package com.freemud.application.sdk.api.ordercenter.request;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class OrderExtInfoDto {
 
@@ -119,4 +121,21 @@ public class OrderExtInfoDto {
      * 扫呗商户号 新支付服务做中转使用
      */
     private String terminalId;
+
+    /**
+     * 停车场ID
+     */
+    private String parkingAreaId;
+    /**
+     * 车牌号
+     */
+    private String carNumber;
+    /**
+     * 入场时间
+     */
+    private String inTime;
+    /**
+     * 出场时间
+     */
+    private String outTime;
 }