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

@@ -104,8 +104,6 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     return;
                 }
 
-
-
                 List<CartGoods> halfProduct = new ArrayList<>();
 
                 for(int x = 0 ; x < products.size() ; x ++){
@@ -129,6 +127,13 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         continue;
                     }
 
+                    // 限时特检的现单价获取促销的现单价
+                    // 商品是否参加特价
+                    boolean cutFlag = hashCutActive(goodsDiscountsMap,product);
+                    if(cutFlag){
+                        product.setFinalPrice(goodsDiscountsMap.get(product.getCartGoodsUid()).getNowPrice());
+                    }
+
                     newProducts.add(product);
                 }
                 shoppingCartGoodsResponseVo.setProducts(newProducts);
@@ -278,20 +283,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
 
 
                 // 商品是否参加特价
-                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;
-                            }
-                        }
-                    }
-                }
-
+                boolean cutFlag  = hashCutActive(goodsDiscountsMap,product);
                 if(cutFlag){
                     product.setFinalPrice(goodsDiscountsMap.get(product.getCartGoodsUid()).getNowPrice());
                 }
@@ -322,4 +314,30 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         shoppingCartGoodsResponseVo.setProducts(newProducts);
     }
 
+    /**
+     * 判断商品是否参加了限时特价
+     * @param goodsDiscountsMap
+     * @param product
+     * @return
+     */
+    public Boolean hashCutActive(Map<String,CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goodsDiscountsMap,
+                                 CartGoods product){
+
+        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;
+                    }
+                }
+            }
+        }
+
+        return cutFlag;
+    }
+
 }