抖音支付更换返回值

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

@@ -25,6 +25,7 @@ import cn.freemud.entities.dto.promotion.OrderBeanRequest;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.ttpay.OrderInfo;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
 import cn.freemud.entities.vo.encircle.PreviewOrderInfoVo;
@@ -2844,6 +2845,13 @@ public class OrderAdapter {
             createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect()));
         }
         createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder());
+        //抖音支付添加返回OrderInfo
+        if(PayChannelType.TIKTOKPAY.getIndex().equals(orderBean.getPayChannelType())) {
+            OrderInfo orderInfo = new OrderInfo();
+            orderInfo.setOrder_id(orderPayResponse.getThirdOrderId());
+            orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());
+        }
+
         return createOrderResponseVo;
     }
 

order-application-service/src/main/java/cn/freemud/entities/ttpay/OrderInfo.java

+package cn.freemud.entities.ttpay;
+
+import lombok.Data;
+
+@Data
+public class OrderInfo {
+    private String order_id;
+    /**
+     * 抖音支付的orderToken 映射为我们order_token
+     */
+    private String order_token;
+}

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

@@ -12,6 +12,7 @@
  */
 package cn.freemud.entities.vo;
 
+import cn.freemud.entities.ttpay.OrderInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -72,4 +73,9 @@ public class CreateOrderResponseVo {
      */
     private String thirdOrderToken;
 
+    /**
+     * 抖音支付返回数据
+     */
+    private OrderInfo orderInfo;
+
 }

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

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