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

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

@@ -10,8 +10,10 @@ import cn.freemud.enums.AvailableCouponQueryFlagEnum;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.impl.AssortmentSdkService;
+import com.alibaba.fastjson.JSON;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -116,6 +118,8 @@ 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),null);
             for (String spqId : validCouponMap.keySet()) {
                 CheckSpqInfoResponseDto sqpInfo = validCouponMap.get(spqId);
                 if (!activityCodeList.contains(sqpInfo.getCouponCode())){ // 表示商品券不够启用金额