Merge branch 'feature/zxh/套餐商品库存新模式-20221018'

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -25,6 +25,7 @@ import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.enums.ProductType;
 import cn.freemud.utils.BeanUtil;
+import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.log.ErrorLog;
@@ -644,6 +645,31 @@ public class ShoppingCartConvertAdapter {
         return result;
     }
 
+    /**
+     * 只维护 套餐券的 model 和 库存限制
+     * @param cartGoods
+     * @param productBeans
+     */
+    public void updateStockModelAndStockLimit(CartGoods cartGoods, List<ProductTypeBeanDTO> productBeans) {
+        try {
+//            LogUtil.info("fisherman 套餐券",JSON.toJSON(cartGoods),JSON.toJSONString(productBeans));
+            Optional<ProductTypeBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), cartGoods.getSpuId())).findFirst();
+            if (!firstProduct.isPresent()) {
+                return;
+            }
+            ProductTypeBeanDTO spuProduct = firstProduct.get();
+            boolean isSkuProduct = ObjectUtils.equals(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType());
+            SkuProductBean skuProduct = isSkuProduct ? spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(cartGoods.getSkuId(), p.getSkuId())).findFirst().orElse(null): null;
+            if(isSkuProduct && skuProduct == null){//特殊场景前端传一个skuid非spuid下多规格商品
+                throw new ServiceException(CartResponseConstant.FAIL);
+            }
+            cartGoods.setStockLimit(isSkuProduct ? ObjectUtils.equals(1, skuProduct.getStockLimit()) : ObjectUtils.equals(1, spuProduct.getStockLimit()));
+            cartGoods.setStockMode(spuProduct.getStockMode());
+        } catch (Exception ex) {
+            ShoppingSdkLogUtil.errorLog("updateCartGoodsInfoNew_Error cartGoods:{},productBeans:{}", ex, JSONObject.toJSONString(cartGoods), JSONObject.toJSONString(productBeans));
+            cartGoods.setCartGoodsUid(null);
+        }
+    }
 
     /**
      * 更新当前购物车商品行信息

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

@@ -1201,6 +1201,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setToastMsg(cartGoodsResponseVo.getToastMsg());
         }
         cartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
+//        LogUtil.info("fisherman 套餐券 002 ",JSON.toJSON(cartGoodsList),JSON.toJSONString(checkCartRequest));
         boolean cannotOrder = true;
         for (CartGoods p : cartGoodsList) {
             //singleOrder=1 表示为不可单点商品， 商品全部为不可单点商品时  不可下单