代码冲突合并

3e88826e · zhiheng.zhang · 582ec019 · 3e88826e
Commit 3e88826e authored Dec 24, 2020 by zhiheng.zhang
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

No files found.
--- a/order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+++ b/order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
@@ -2850,6 +2850,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;
    }