Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java

@@ -66,6 +66,16 @@ public class OrderPayResponse {
     private String payMode;
     private List<PayItem> payItem = new ArrayList<>();
 
+    /**
+     * 抖音支付的返回的为orderId 映射为我们thirdOrderId
+     */
+    private String thirdOrderId;
+
+    /**
+     * 抖音支付的orderToken 映射为我们thirdOrderToken
+     */
+    private String thirdOrderToken;
+
     @NoArgsConstructor
     @Data
     public static class PayOrderBean {

order-application-service/pom.xml

@@ -320,7 +320,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.3.RELEASE</version>
+            <version>2.6.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2887,6 +2887,8 @@ public class OrderAdapter {
         }
         responseDto.setStatusCode(unifiedOrderResponse.getStatusCode());
         responseDto.setPayTransId(unifiedOrderResponse.getPayTransId());
+        responseDto.setThirdOrderToken(unifiedOrderResponse.getOrderToken());
+        responseDto.setThirdOrderId(unifiedOrderResponse.getOrderId());
         return responseDto;
     }
 

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

@@ -62,4 +62,14 @@ public class CreateOrderResponseVo {
     @ApiModelProperty(value = "支付宝参数 唤起支付宝支付使用")
     private String orderStr;
 
+    /**
+     * 抖音支付的返回的为orderId 映射为我们thirdOrderId
+     */
+    private String thirdOrderId;
+
+    /**
+     * 抖音支付的orderToken  映射为我们thirdOrderToken
+     */
+    private String thirdOrderToken;
+
 }

order-application-service/src/main/java/cn/freemud/enums/OrderChannelType.java

@@ -22,7 +22,9 @@ public enum OrderChannelType {
 
     SAASMALL("saasmall", "微商城"),
 
-    APP("app", "APP");
+    APP("app", "APP"),
+
+    TOUTIAO("toutiao", "抖音小程序");;
 
     private String code;
 

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

@@ -2420,6 +2420,10 @@ public class OrderServiceImpl implements Orderservice {
         } else if (UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())) {
             orderClient = OrderClientType.APP;
         }
+        //抖音小程序
+        if(OrderChannelType.TOUTIAO.getCode().equals(createOrderVo.getChannelType())) {
+            orderClient = OrderClientType.TOUTIAO;
+        }
         long totalAmount = 0;
         int cardAmount = 0;
         QueryOrdersResponse.DataBean.OrderBean fatherBeanListOne = new QueryOrdersResponse.DataBean.OrderBean();

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

@@ -36,6 +36,7 @@ public enum OrderClientType {
     SAASMALL(23, "微商城"),
     DPZHCT(24, "美团点评智慧餐厅"),
     FMWD(25, "非码微店"),
+    TOUTIAO(27, "抖音小程序"),
     PARKING(99 , "农工商停车"),
     FU_YOU(100 , "富有"),
     ;