From a69ec998d9fe8fa8ea6c40175bebc4e53a227d5b Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期四, 11 六月 2020 09:26:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java index 91eed5c..3ff3530 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java @@ -1191,8 +1191,10 @@ @Override public void processVipShopOrder(VipShopOrder order) { + if (order == null || order.getDetailList() == null || order.getDetailList().size() == 0) return; + // 鏍规嵁ext1涓巗ubUnionId璺熷崟 String channelTag = order.getChannelTag(); -- Gitblit v1.8.0