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

e5f7212d · xiaoer.li@freemud.com · 545cf1e0 · 89626509 · e5f7212d
Commit e5f7212d authored Nov 19, 2020 by xiaoer.li@freemud.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

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

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
@@ -2538,7 +2538,7 @@ public class OrderServiceImpl implements Orderservice {
                orderPayResponse.setPartnerId(orderBean.getCompanyId());
                orderPayResponse.setOrderId(orderBean.getOid());
                orderPayResponse.setPayMode(PayChannelType.WECHAT.getEbcode());
-                if (orderPayResponse.getPayOrder()!=null) {
+                if (orderPayResponse.getPayOrder()!=null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
                    orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
                }
            }