Merge branch 'develop' of gitlab.freemud.com:order-group-application/order-group into develop

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.4.RELEASE</version>
+            <version>2.6.4.SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

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

@@ -2864,10 +2864,11 @@ public class OrderAdapter {
         }
         createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder());
         //抖音支付添加返回OrderInfo
-        if(PayChannelType.TIKTOKPAY.getIndex().equals(orderBean.getPayChannelType())) {
+        if(String.valueOf(PayChannelType.TIKTOKPAY.getIndex()).equals(orderBean.getPayChannelType())) {
             OrderInfo orderInfo = new OrderInfo();
             orderInfo.setOrder_id(orderPayResponse.getThirdOrderId());
             orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());
+            createOrderResponseVo.setOrderInfo(orderInfo);
         }
 
         return createOrderResponseVo;

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

@@ -64,16 +64,6 @@ public class CreateOrderResponseVo {
     private String orderStr;
 
     /**
-     * 抖音支付的返回的为orderId 映射为我们thirdOrderId
-     */
-    private String thirdOrderId;
-
-    /**
-     * 抖音支付的orderToken  映射为我们thirdOrderToken
-     */
-    private String thirdOrderToken;
-
-    /**
      * 抖音支付返回数据
      */
     private OrderInfo orderInfo;

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

@@ -2443,7 +2443,7 @@ public class OrderServiceImpl implements Orderservice {
             orderClient = OrderClientType.APP;
         }
         //抖音小程序
-        if(PayChannelType.TIKTOKPAY.getIndex().equals(createOrderVo.getPayChannelType()) && "3".equalsIgnoreCase(createOrderVo.getChannel())) {
+        if(PayChannelType.TIKTOKPAY.getIndex().equals(createOrderVo.getPayChannelType()) && "5".equalsIgnoreCase(createOrderVo.getChannel())) {
             orderClient = OrderClientType.TIKTOKPAY;
         }
         long totalAmount = 0;

order-management/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.3.RELEASE</version>
+            <version>2.6.4.SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>