From c0501093c90fc539a06360b9a2b27528536fb4a4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 13 Oct 2020 17:03:34 +0800 Subject: [PATCH] fix bug --- .../src/main/java/com/iformall/controller/WxCarController.java | 2 +- .../java/com/iformall/service/park/impl/etcp/EtcpHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 2a12fac96..aa2e68e3d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -318,7 +318,7 @@ public class WxCarController extends BaseController { userCarQ.setId(couponOrderId); userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); List list = wxCouponOrderService.carListCUserVo(userCarQ); - if (list.size() > 0) { + if (null != list && list.size() > 0) { userCar = list.get(0); } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java index 634c25188..37b638d8d 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java @@ -355,7 +355,7 @@ public class EtcpHelper { String businessId = ""; // 获取merchantId WxMerchantVo merchantVo = null; - if (userCar.getMerchantVoList().size() > 0) { + if (null != userCar.getMerchantVoList() && userCar.getMerchantVoList().size() > 0) { merchantVo = userCar.getMerchantVoList().get(0); }