删除无效日志 合并代码

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

@@ -241,9 +241,7 @@ public class AssortmentSdkService {
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
-        LogUtil.info("替换购物车数据检验结果 to final", checkCartRequest,JSON.toJSONString(oldAllCartGoodsList));
         baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
-        LogUtil.info("替换购物车数据检验结果 final", checkCartRequest,JSON.toJSONString(baseResponse));
         if (baseResponse == null) {
             return null;
         }

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

@@ -2951,8 +2951,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 // 异常商品
                 GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType());
         List<CartGoods> excludeGoods = allCartGoodsList.stream().filter(cartGoods -> !excludeType.contains(cartGoods.getGoodsType())).collect(toList());
-
-        LogUtil.info("replaceGoodsType begin ", null ,JSON.toJSONString(excludeGoods));
         List<CartGoods> HGcouponGoods = allCartGoodsList.stream().filter(cartGoods -> cartGoods.getGoodsType().equals(GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType())).collect(toList());
         if (!CollectionUtils.isEmpty(HGcouponGoods)) {
             // 替换 换购券的商品 变成普通商品 --> 优惠券商品变成 普通商品带到其他门店去
@@ -2962,8 +2960,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             });
             excludeGoods.addAll(goodsList);
         }
-        LogUtil.info("replaceGoodsType end ", null ,JSON.toJSONString(excludeGoods));
-
         if (CollectionUtils.isEmpty(excludeGoods)) {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_REPLACE_GOODS_AND_CLEAR);
         }
@@ -2974,18 +2970,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         // 拿出 spu sku 校验 当前店铺是否有 商品
         ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
-//        String storeId = replaceGoodsRequestVo.getShopId();
-//        String menuType = replaceGoodsRequestVo.getMenuType();
-//        List<String> spuIds = excludeGoods.stream().map(CartGoods::getSpuId).collect(toList());
-//        List<ProductBean> productBeanListSpuClass = assortmentSdkService.getProductsInfo(partnerId, storeId, spuIds, menuType, this.shoppingCartBaseService);
-//        LogUtil.info("productBeanListSpuClass", spuIds,JSON.toJSONString(productBeanListSpuClass));
-//        // 没有查到商品 fisherman -> 给前端提示就行
-//        if(productBeanListSpuClass == null || productBeanListSpuClass.isEmpty()){
-//            return ResponseUtil.error(ResponseResult.SHOPPING_CART_REPLACE_GOODS_AND_CLEAR);
-//        }
-        LogUtil.info("old shopcat msg ", null,JSON.toJSONString(excludeGoods));
         fullReplace = updateCartGoodsLegal(excludeGoods, userId , replaceGoodsRequestVo, shoppingCartGoodsResponseVo ,fullReplace);
-        LogUtil.info("new shopcat msg ", null,JSON.toJSONString(excludeGoods));
         if (!fullReplace) {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_REPLACE_GOODS_AND_CLEAR);
         }
@@ -3169,9 +3154,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     private boolean updateCartGoodsLegal(List<CartGoods> excludeGoods, String userId, ShopGoodsReplaceVo replaceGoodsRequestVo, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,boolean fullReplace) {
         //存储新添加的购物车信息
-
         //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
-
         // 删除商品价格 方便不校验商品价格
         excludeGoods.forEach(cartGoods -> cartGoods.setFinalPrice(null));
         CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(excludeGoods, replaceGoodsRequestVo.getPartnerId(),
@@ -3182,7 +3165,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
         }
         List<CartGoods> allCartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
-        LogUtil.info("替换查询结果 ", JSON.toJSONString(excludeGoods),JSON.toJSONString(allCartGoodsList));
         // 如果查询出来的数据 为null  表示没有该商品  需要处理 fisherman
         if (CollectionUtils.isEmpty(allCartGoodsList)) {
             fullReplace = false;
@@ -3192,16 +3174,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             // 表示有数据被删除
             fullReplace = false;
         }
-        //判断当前商品在购物车是否已存在,存在则数量＋1,不存在商品行 + 1
-//        allCartGoodsList.forEach(oldCartGoods -> {
-//            int index;
-//            if ((index = nowCartGoodsList.indexOf(oldCartGoods)) >= 0) {
-//                nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty());
-//            } else {
-//                nowCartGoodsList.add(oldCartGoods);
-//            }
-//        });
-
         //校验库存
         List<CartGoods> stockLimitGoods = allCartGoodsList.stream().filter(CartGoods::isStockLimit).collect(toList());
         List<CartGoods> notCheckStock = allCartGoodsList.stream().filter(cartGoods -> !cartGoods.isStockLimit()).collect(toList());
@@ -3249,7 +3221,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         allCartGoodsList = notCheckStock;
 
-        // fisherman 删除 新门店的缓存数据 重新添加 测试 之后需要放开
         shoppingCartNewBaseService.clear(replaceGoodsRequestVo.getPartnerId(), replaceGoodsRequestVo.getShopId(), userId);
         // 重新set购物车信息到缓存中
         assortmentSdkService.setShoppingCart(replaceGoodsRequestVo.getPartnerId(), replaceGoodsRequestVo.getShopId(),