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

6ae3b28e · xiaoer.li@freemud.com · 4fdd271a · ad92be70 · 6ae3b28e
Commit 6ae3b28e authored Nov 26, 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/adapter/OrderAdapter.java
+1 -1

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
@@ -1148,7 +1148,7 @@ public class OrderAdapter {
                    responseVo.setOrderPayType(PayChannelType.WECHAT.getName());
                }
            }
-            else if (ordersBean.getOrderPayItem().size()>0) {
+            else if (ordersBean.getOrderPayItem()!=null && ordersBean.getOrderPayItem().size()>0) {
                responseVo.setOrderPayType(PayChannelType.COMB.getName());
            }
            else {