Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei365/commodity/service/impl/CouponServiceImpl.java

@@ -114,7 +114,7 @@ public class CouponServiceImpl implements CouponService {
         List<CouponVo> couponList = couponMapper.findCouponList(userId);
         //剔除超级会员优惠券
         List<Integer> vipCoupon = couponMapper.findVipCoupon();
-        if (couponList.size() > 0 && couponList != null) {
+        if (couponList != null && couponList.size() > 0) {
             for (CouponVo couponVo : couponList) {
                 if (vipCoupon.contains(couponVo.getCouponId())) {
                     couponList.remove(couponVo);
@@ -214,7 +214,7 @@ public class CouponServiceImpl implements CouponService {
         List<CouponVo> notCouponList = couponMapper.findCouponList(userId);
         filterCoupon(source, product, notCouponList);
         //超级会员优惠券移除
-        if (notCouponList.size() > 0 && notCouponList != null) {
+        if (notCouponList != null && notCouponList.size() > 0) {
             for (CouponVo couponVo : notCouponList) {
                 if (vipCoupon.contains(couponVo.getCouponId())) {
                     notCouponList.remove(couponVo);
@@ -225,7 +225,7 @@ public class CouponServiceImpl implements CouponService {
         //已领取
         List<CouponVo> couponList = couponMapper.findCouponClub(userId, 1);
         //超级会员优惠券移除
-        if (couponList.size() > 0 && couponList != null) {
+        if (couponList != null && couponList.size() > 0) {
             for (CouponVo couponVo : couponList) {
                 if (vipCoupon.contains(couponVo.getCouponId())) {
                     notCouponList.remove(couponVo);