代码冲突合并

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

@@ -2516,6 +2516,10 @@ public class OrderServiceImpl implements Orderservice {
         } else if (UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())) {
             orderClient = OrderClientType.APP;
         }
+        //抖音小程序
+        if(PayChannelType.TIKTOKPAY.getIndex().equals(createOrderVo.getPayChannelType()) && "5".equalsIgnoreCase(createOrderVo.getChannel())) {
+            orderClient = OrderClientType.TIKTOKPAY;
+        }
         long totalAmount = 0;
         int cardAmount = 0;
         QueryOrdersResponse.DataBean.OrderBean fatherBeanListOne = new QueryOrdersResponse.DataBean.OrderBean();