解决空指针问题

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -585,8 +585,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
 
     private void newCalculationUpdateCouponStatus(String userId, String partnerId, String storeId, Integer bizType, CartGoods cartGoods, List<CartGoods> cartGoodsList, ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult) {
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = null;
+        if (null != discountResult) {
+             discounts = discountResult.getDiscounts();
+        }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> mnCouponDiscount = null;
+
         if (CollectionUtils.isNotEmpty(discounts)) {
             mnCouponDiscount = discounts.stream().filter(discount -> ActivityTypeEnum.TYPE_330.getCode().equals(discount.getType())).collect(toList());
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java

@@ -155,6 +155,7 @@ public class CalculationSharingDiscountService {
                 coupon.setCode(checkSpqInfo.getCouponCode());
                 coupon.setActivityCode(checkSpqInfo.getActiveCode());
                 ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = coupons.stream().filter(p -> coupon.getActivityCode().equals(p.getActivityCode()) && coupon.getCode().equals(p.getCode())).findFirst().orElse(null);
+                // 0是非结算页，1为结算页
                 accountFlag = accountFlag == null ? 0 : accountFlag;
                 if (calculationDiscountCoupon == null) {
                     if (GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType()) && accountFlag == 1 ){