Merge branch 'feature/20200525_会员价' into develop

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

@@ -35,7 +35,7 @@ public class MemberDiscountServiceImpl implements IPromotionService {
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
         //获取每个商品的会员价优惠单价
         Map<String, Long> apportionGoodsDetail = getApportionGoodsDetail(calculationDiscountResult);
-        if (apportionGoodsDetail.size()==0){
+        if (apportionGoodsDetail==null||apportionGoodsDetail.size()==0){
             return;
         }