Commit b609f078 by zhiheng.zhang

Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into qa

parents ea6d43cd dbeb3f31
...@@ -617,6 +617,7 @@ public class OrderSdkAdapter { ...@@ -617,6 +617,7 @@ public class OrderSdkAdapter {
orderClients.add(OrderClientType.APP.getIndex()); orderClients.add(OrderClientType.APP.getIndex());
} }
} }
orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
orderClients.add(OrderClientType.ALIPAY.getIndex()); orderClients.add(OrderClientType.ALIPAY.getIndex());
orderConditionsReq.setOrderClients(orderClients); orderConditionsReq.setOrderClients(orderClients);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......
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