Skip to content

O
order-group
Commit e5f7212d by xiaoer.li@freemud.com
Options

Merge branch 'feature/2020-1104-混合支付' into qa

parents 545cf1e0 89626509
Showing with 1 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -2538,7 +2538,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2538,7 +2538,7 @@ public class OrderServiceImpl implements Orderservice {
orderPayResponse.setPartnerId(orderBean.getCompanyId()); orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid()); orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(PayChannelType.WECHAT.getEbcode()); orderPayResponse.setPayMode(PayChannelType.WECHAT.getEbcode());
if (orderPayResponse.getPayOrder()!=null) { if (orderPayResponse.getPayOrder()!=null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode()); orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
} }
} }
......
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