Merge branch 'fixbug_库存校验空指针' into develop

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

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

@@ -51,6 +51,7 @@ import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmoun
 import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
+import com.freemud.application.sdk.api.promotioncenter.response.ActivityResponse;
 import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
@@ -78,9 +79,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static cn.freemud.constant.ApplicationConstant.DELIVERY_DISCOUNT_DESC1;
-import static cn.freemud.constant.ApplicationConstant.DELIVERY_DISCOUNT_DESC2;
-import static cn.freemud.constant.ApplicationConstant.DELIVERY_DISCOUNT_DESC3;
+import static cn.freemud.constant.ApplicationConstant.*;
 import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_EMPTY_GOODS_LIST;
 import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS;
 import static java.util.stream.Collectors.toList;
@@ -418,7 +417,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             if ((CollectionUtils.isEmpty(availableStocks.getResult())) || (availableStocks.getResult().get(0).getQty() != null &&
                     qty > availableStocks.getResult().get(0).getQty())) {
                 Integer stock = 0;
-                if (!CollectionUtils.isEmpty(availableStocks.getResult()) && (stock = availableStocks.getResult().get(0).getQty()) > 0) {
+                if (availableStocks.getResult().get(0).getQty() != null && (stock = availableStocks.getResult().get(0).getQty()) > 0) {
                     throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
                 }
                 throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
@@ -1139,36 +1138,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     }
 
     /**
-     * 添加非商品券商品
-     *
-     * @param addShoppingCartGoodsRequestVo
-     * @param cartGoods
-     * @param goodsId
-     * @param userId
-     * @param shoppingCartGoodsResponseVo
-     * @param allCartGoodsList
-     * @param productBeanListSpuClass
-     */
-    private Map<String, List<CartGoods>> addNotProductGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, CartGoods cartGoods
-            , String goodsId, String userId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, List<CartGoods> allCartGoodsList
-            , List<ProductBeanDTO> productBeanListSpuClass) {
-
-        //校验合法性,更新缓存中购物车信息
-        allCartGoodsList = updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
-
-        // 如果购物车中有商品券，则当前添加的商品是特价商品时，需要提示“已选商品券，与其他优惠商品不同享，商品将恢复原价”
-        boolean haveCouponProduct = allCartGoodsList.parallelStream().anyMatch(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX));
-        if (haveCouponProduct && isSpecialGoods(addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(), userId, addShoppingCartGoodsRequestVo.getAppId(), goodsId, addShoppingCartGoodsRequestVo.getOrderType())) {
-            // 如果购物车先加入商品券，再加入促销商品，toast提示“已选商品券，与其他优惠商品不同享，商品将恢复原价”
-            setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.HAS_GOODS_COUPON_WHEN_ADD_SPECIAL_GOODS);
-        }
-
-        Map<String, List<CartGoods>> map = new HashMap<>();
-        map.put(productBeanListSpuClass.get(0).getName(), allCartGoodsList);
-        return map;
-    }
-
-    /**
      * 添加商品券商品
      *
      * @param addShoppingCartGoodsRequestVo
@@ -1212,7 +1181,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.HAS_OTHER_ACTIVITY_WHEN_ADD_GOODS_COUPON);
             }
             //校验合法性,更新缓存中购物车信息
-            allCartGoodsList = updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
+            updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
         }
     }
 
@@ -1250,7 +1219,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 (CollectionUtils.isEmpty(availableStocks.getResult()) || availableStocks.getResult().get(0).getQty() == null
                         || availableStocks.getResult().get(0).getQty() < qty)) {
             Integer stock = 0;
-            if (!CollectionUtils.isEmpty(availableStocks.getResult()) && (stock = availableStocks.getResult().get(0).getQty()) > 0) {
+            if (availableStocks.getResult().get(0).getQty() != null && (stock = availableStocks.getResult().get(0).getQty()) > 0) {
                 throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
             }
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
@@ -1272,11 +1241,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     private void setAddAndUpdateResponse(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
             , List<CartGoods> cartGoodsList, String toastMsg, String partnerId, String storeId, String userId, String opt, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        //updateCartGoodsResponse(shoppingCartGoodsResponseVo, calculationDiscountResult);
         shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
         shoppingCartGoodsResponseVo.setProductsCount(cartGoodsList.size());
         if (StringUtils.isNotEmpty(toastMsg)) {
+            toastMsg=shoppingCartInfoRequestVo!=null && ObjectUtils.equals(1, shoppingCartInfoRequestVo.getFlag())?SHOPPING_CART_EMPTY_GOODS_LIST:SHOPPING_CART_INVALIAD_GOODS;
             setToastMsgIfNotExist(shoppingCartGoodsResponseVo, toastMsg);
+            //结算页，只有商品全部非法（即products为空）时，才提示changed为true toastMsg 不为空
+            if (shoppingCartInfoRequestVo!=null && ObjectUtils.equals(1, shoppingCartInfoRequestVo.getFlag())){
+                shoppingCartGoodsResponseVo.setChanged(CollectionUtils.isEmpty(cartGoodsList));
+                shoppingCartGoodsResponseVo.setToastMsg(CollectionUtils.isEmpty(cartGoodsList)?toastMsg:"");
+            }
+
         }
         // 更新和添加商品时不需要包装费
         if (ShoppingCartConstant.ADD_AND_UPDATE.equals(opt)) {
@@ -1299,7 +1274,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount);
             shoppingCartGoodsResponseVo.setTotalAmount(totalAmount);
         }
-        shoppingCartGoodsResponseVo.setChanged(false);
+
     }
 
     /**