Merge branch 'hotfix/20210610_codev4_coupon_npe_miaohui' into 'master'

platform orderCheck coupon NPE repaired

See merge request !117

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -560,14 +560,14 @@ public class CheckOrder {
             if (Objects.equals(getCouponDetailResponseDto, null) || CollectionUtils.isEmpty(getCouponDetailResponseDto.getDetails())
                     || getCouponDetailResponseDto.getDetails().get(0).getActive() == null
                     || getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode() == null) {
-                if ((CollectionUtils.isNotEmpty(getCouponDetailResponseDto.getDetails().get(0).getActiveRestrictionVOS())
+                // 返回信息为空
+                throw new ServiceException(ResponseResult.COUPON_GETINFO_INVAILD);
+            } else if (CollectionUtils.isNotEmpty(getCouponDetailResponseDto.getDetails().get(0).getActiveRestrictionVOS())
                     && CollectionUtils.isEmpty(getCouponDetailResponseDto.getDetails().get(0).getActiveRestrictionVOS().stream()
                     .filter(a -> Objects.equals(a.getStoreIdPartner(), createOrderVo.getShopId())).collect(Collectors.toList()))
-                )) {
+            ) {
+                // 当前门店不可用
                 throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT);
-                } else {
-                    throw new ServiceException(ResponseResult.COUPON_GETINFO_INVAILD);
-                }
             }
             List<GetCouponDetailResponseDto.ActiveRedeemTimeInterval> activeRedeemTimeIntervalList = getCouponDetailResponseDto.getDetails().get(0).getActiveRedeemTimeIntervalList();
             checkCouonRedeemTime(activeRedeemTimeIntervalList);
@@ -590,14 +590,14 @@ public class CheckOrder {
                 if (Objects.equals(getCouponDetailResponseDto, null) || CollectionUtils.isEmpty(getCouponDetailResponseDto.getDetails())
                         || getCouponDetailResponseDto.getDetails().get(0).getActive() == null
                         || getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode() == null) {
-                    if ((CollectionUtils.isNotEmpty(getCouponDetailResponseDto.getDetails().get(0).getActiveRestrictionVOS())
+                    // 返回信息为空
+                    throw new ServiceException(ResponseResult.COUPON_GETINFO_INVAILD);
+                } else if (CollectionUtils.isNotEmpty(getCouponDetailResponseDto.getDetails().get(0).getActiveRestrictionVOS())
                         && CollectionUtils.isEmpty(getCouponDetailResponseDto.getDetails().get(0).getActiveRestrictionVOS().stream()
                         .filter(a -> Objects.equals(a.getStoreIdPartner(), createOrderVo.getShopId())).collect(Collectors.toList()))
-                    )) {
+                ) {
+                    // 当前门店不可用
                     throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT);
-                    } else {
-                        throw new ServiceException(ResponseResult.COUPON_GETINFO_INVAILD);
-                    }
                 }
                 String activeCode = getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode();
                 ShoppingCartInfoRequestVo.couponCode coupon = new ShoppingCartInfoRequestVo.couponCode();