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

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

@@ -41,6 +41,7 @@ public enum OrderSourceType {
     DPZHCT("dpzhct", "美团点评智慧餐厅", 24),
     FMWD("fmwd", "非码微店", 25),
     Y_POS("ypos", "非码云POS", 26),
+    TIKTOKPAY("tiktokpay","抖音支付", 27),
     parkingmanual("parkingmanual", "农工商停车手工录单", 98),
     PARKING("parking", "农工商停车", 99),
     SDG("sdg", "闪电购", 1000);

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

@@ -2828,6 +2828,10 @@ public class OrderAdapter {
         }
         orderPayDto.setProducts(productBeans);
         orderPayDto.setPayCode(paymentRequest.getPayCode());
+        //抖音支付的payCode = 10066
+        if(OrderClientType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())){
+            orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
+        }
         orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
         return orderPayDto;
     }

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

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

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

@@ -2453,8 +2453,8 @@ public class OrderServiceImpl implements Orderservice {
             orderClient = OrderClientType.APP;
         }
         //抖音小程序
-        if(OrderChannelType.TOUTIAO.getCode().equals(createOrderVo.getChannelType())) {
-            orderClient = OrderClientType.TOUTIAO;
+        if(PayChannelType.TIKTOKPAY.getIndex().equals(createOrderVo.getPayChannelType())) {
+            orderClient = OrderClientType.TIKTOKPAY;
         }
         long totalAmount = 0;
         int cardAmount = 0;

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

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

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

@@ -12,7 +12,8 @@ public enum PayChannelType {
     SVC((byte)3,"10102","储值卡"),
     COMB((byte)4,"10212","混合支付"),
     USVCP((byte)5,"10556", "电子风味卡支付"),
-    ZERO((byte)6,"100000", "0元支付");
+    ZERO((byte)6,"100000", "0元支付"),
+    TIKTOKPAY((byte)7,"10066", "抖音支付");
 
     private Byte index;
     private String ebcode;