Merge branch 'KA-【华莱士】【半定制】一个订单多张优惠券使用场景-zxh' into qa

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

@@ -598,7 +598,6 @@ public class ShoppingCartConvertAdapter {
             productType.setMemberDiscount(cartGoods.getMemberDiscount());
             validateShopProductRequest.getProductTypeList().add(productType);
         }
-        ShoppingSdkLogUtil.infoLog("替换购物车数据检验结果 01 --> validateShopProductRequest:{} cartGoodsList:{}", validateShopProductRequest, JSON.toJSON(checkCartRequest.getCartGoodsList()));
         return validateShopProductRequest;
     }
 

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

@@ -131,10 +131,8 @@ public class ProductServiceImpl implements ProductService {
                 checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                 checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_MATERIAL_ERROR);
             }
-            ShoppingSdkLogUtil.infoLog("替换购物车数据检验结果 2 --> checkCartRequest:{}", checkCartRequest);
             return CartResponseUtil.success(checkCartRequest);
         } catch (Exception e) {
-            ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", checkCartRequest.getTrackingNo(), e.getMessage(), "checkAllCartGoods", checkCartRequest, e, Level.ERROR);
             checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
             checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
             return CartResponseUtil.error(e.getMessage(),checkCartRequest);

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

@@ -118,8 +118,6 @@ public class CouponSharingService {
         Map<String, List<String>> spqIdToCartUuid = calculationDiscountResult == null ? new HashMap<>() : calculationDiscountResult.getSpqIdToCartUuid();
         if (MapUtils.isNotEmpty(validCouponMap) && MapUtils.isNotEmpty(spqIdToCartUuid) && calculationDiscountResult != null){
             List<String> activityCodeList = calculationDiscountResult.getDiscounts().stream().map(p -> p.getActivityCode()).collect(Collectors.toList());
-            ShoppingSdkLogUtil.printLog("fisherman 查看商品券删除的问题 - 01->", JSON.toJSONString(validCouponMap),JSON.toJSONString(spqIdToCartUuid));
-            ShoppingSdkLogUtil.printLog("fisherman 查看商品券删除的问题 - 02->", JSON.toJSONString(cartGoodsList),JSON.toJSONString(activityCodeList));
             for (String spqId : validCouponMap.keySet()) {
                 CheckSpqInfoResponseDto sqpInfo = validCouponMap.get(spqId);
                 if (!activityCodeList.contains(sqpInfo.getCouponCode())){ // 表示商品券不够启用金额