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

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

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

@@ -59,4 +59,10 @@ public class SellCouponCreateOrderVo {
 //    @NotEmpty(message = "version 版本号不能为空")
     private String version;
 
+
+    /**
+     * 渠道 1 saas 2 img 爱马哥  默认saas 3. iwc i围餐
+     */
+    private String channel;
+
 }

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

@@ -2517,7 +2517,8 @@ public class OrderServiceImpl implements Orderservice {
             orderClient = OrderClientType.APP;
         }
         //抖音小程序
-        if(PayChannelType.TIKTOKPAY.getIndex().equals(createOrderVo.getPayChannelType()) && "5".equalsIgnoreCase(createOrderVo.getChannel())) {
+        if("5".equalsIgnoreCase(createOrderVo.getChannel())) {
+            createOrderVo.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
             orderClient = OrderClientType.TIKTOKPAY;
         }
         long totalAmount = 0;
@@ -2816,7 +2817,7 @@ public class OrderServiceImpl implements Orderservice {
                     orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
                 }
                 //抖音支付
-                if(orderBean.getPayChannelType().equalsIgnoreCase(PayChannelType.TIKTOKPAY.getIndex().toString())){
+                if(PayChannelType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getPayChannelType())){
                     orderPayResponse.setPayMode(PayChannelType.TIKTOKPAY.getEbcode());
                 }
 

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

@@ -37,6 +37,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
+import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderChangeStateReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.create.*;
@@ -409,6 +410,11 @@ public class SellCouponOrderServiceImpl {
         if(UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())){
             orderClient = OrderClientType.APP.getIndex();
         }
+        //抖音小程序
+        if("5".equalsIgnoreCase(requestVo.getChannel())) {
+            request.setPayChannel(PayChannelType.TIKTOKPAY.getIndex().toString());
+            orderClient = OrderClientType.TIKTOKPAY.getIndex();
+        }
         String partnerId = userLoginInfoDto.getPartnerId();
         request.setOrderClient(orderClient);
         request.setPartnerId(partnerId);
@@ -493,6 +499,10 @@ public class SellCouponOrderServiceImpl {
         request.setOrderExtended(orderAdapter.saveStoreInfo(storeInfo));
         request.setOperator(userLoginInfoDto.getNickName());
         request.setAppId(userLoginInfoDto.getWxAppId());
+        if("5".equalsIgnoreCase(requestVo.getChannel().toString())){
+            request.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
+        }
+        request.setPayChannel(requestVo.getChannel());
         return request;
 
     }