Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

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

@@ -18,6 +18,7 @@ import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -33,6 +34,10 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                                                CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
                                                Integer flag) {
 
+        ApiLog.info("第二件半价，shoppingCartGoodsResponseVo，",shoppingCartGoodsResponseVo);
+
+        ApiLog.info("第二件半价，discountResult，",discountResult);
+
         if(discountResult != null){
 
             List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = new ArrayList<>();
@@ -66,12 +71,13 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 }
                 oneGoodsDiscounts.forEach(discount -> {
                     if(Objects.equals(discount.getType(),ActivityTypeEnum.TYPE_53.getCode())){
-                        goodsDiscountsMap.put(goodsDiscount.getCartGoodsUid() + discount.getGoodsId(),discount);
+                        goodsDiscountsMap.put(goodsDiscount.getCartGoodsUid() + "-" + discount.getGoodsId(),discount);
                     }
 
                 });
             });
 
+            ApiLog.info("第二件半价，goodsDiscountsMap，",goodsDiscountsMap);
 
             List<CartGoods> newProducts = new ArrayList<>();
             List<CartGoods> products = shoppingCartGoodsResponseVo.getProducts();
@@ -79,13 +85,13 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 if(products == null || products.isEmpty()){
                     return;
                 }
-
+                ApiLog.info("第二件半价，products，",products);
                 products.forEach(product -> {
                     Integer num = 0;
                     // 商品优惠的金额
                     Long discountAmount = 0L;
-                    if(goodsDiscountsMap.get(product.getCartGoodsUid() + product.getGoodsId()) != null){
-                        CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = goodsDiscountsMap.get(product.getCartGoodsUid() + product.getGoodsId());
+                    if(goodsDiscountsMap.get(product.getCartGoodsUid() + "-" + product.getGoodsId()) != null){
+                        CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = goodsDiscountsMap.get(product.getCartGoodsUid() + "-" + product.getGoodsId());
                         if(discount == null){
                             return;
                         }