Skip to content

O
order-group
Commit 3e88826e by zhiheng.zhang
Options

代码冲突合并

parent 582ec019
Showing with 4 additions and 0 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -2850,6 +2850,10 @@ public class OrderAdapter { ...@@ -2850,6 +2850,10 @@ public class OrderAdapter {
} }
orderPayDto.setProducts(productBeans); orderPayDto.setProducts(productBeans);
orderPayDto.setPayCode(paymentRequest.getPayCode()); orderPayDto.setPayCode(paymentRequest.getPayCode());
//抖音支付的payCode = 10066
if(OrderClientType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())){
orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
}
orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType())); orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
return orderPayDto; return orderPayDto;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment