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

@@ -133,8 +133,22 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         product.setQty(newQty);
 
 
-                        // 限时特价行显示优惠后的单价
-                        if(ObjectUtils.equals(product.getActivityType(),ActivityTypeEnum.TYPE_2.getCode())){
+                        // 商品是否参加特价
+                        boolean cutFlag = false;
+                        if(goodsDiscountsMap.get(product.getCartGoodsUid()) != null){
+                            CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods goods = goodsDiscountsMap.get(product.getCartGoodsUid());
+                            List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> goodsDiscountsList = goods.getDiscounts();
+                            if(goodsDiscountsList != null && !goodsDiscountsList.isEmpty()){
+                                for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount gd : goodsDiscountsList){
+                                    if(ObjectUtils.equals(gd.getType(),ActivityTypeEnum.TYPE_2.getCode())){
+                                        cutFlag = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+
+                        if(cutFlag){
                             product.setFinalPrice(goodsDiscountsMap.get(product.getCartGoodsUid()).getNowPrice());
                         }