Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop'

限时特价及组合优惠修改

See merge request !55

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

@@ -50,7 +50,7 @@ public class SetMealServiceImpl implements IPromotionService {
         Map<String, Integer> numberMap = new HashMap<>();
         // 当前商品行现价
         Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap = calculationDiscountResult.getGoods().parallelStream()
-                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
+                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getCartGoodsUid, Function.identity(), (k1, k2) -> k1));
 
         // 设置商品原价与商品现价的初始值
         for (CartGoods cartGoods : setMealProducts) {
@@ -139,19 +139,19 @@ public class SetMealServiceImpl implements IPromotionService {
      */
     private String getTotalAmount(CartGoods cartGoods, long productGroupAmount, Map<String, Integer> numberMap, Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap) {
 
-        if (goodsMap.isEmpty()||goodsMap.get(cartGoods.getGoodsId()).getDiscountAmount() == 0) {
+        if (goodsMap.isEmpty()||goodsMap.get(cartGoods.getCartGoodsUid()).getDiscountAmount() == 0) {
             cartGoods.setAmount((cartGoods.getFinalPrice() + productGroupAmount) * cartGoods.getQty());
             return "";
         }
         if (numberMap.get(cartGoods.getGoodsId()) == null) {
-            int actualGoodsNumber = goodsMap.get(cartGoods.getGoodsId()).getDiscounts().stream().mapToInt(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount::getActualGoodsNumber)
-                    .min().orElse(goodsMap.get(cartGoods.getGoodsId()).getGoodsQuantity());
+            int actualGoodsNumber = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts().stream().mapToInt(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount::getActualGoodsNumber)
+                    .min().orElse(goodsMap.get(cartGoods.getCartGoodsUid()).getGoodsQuantity());
             numberMap.put(cartGoods.getGoodsId(), actualGoodsNumber);
         }
         // 可优惠数量
         Integer number = numberMap.get(cartGoods.getGoodsId());
         if (number > 0) {
-            Long nowPrice = goodsMap.get(cartGoods.getGoodsId()).getNowPrice();
+            Long nowPrice = goodsMap.get(cartGoods.getCartGoodsUid()).getNowPrice();
             //套餐固定商品价格
             long productComboxAmount = cartGoods.getQty() > number ? number * nowPrice + (cartGoods.getQty() - number) * cartGoods.getFinalPrice() : cartGoods.getQty() * nowPrice;
             cartGoods.setAmount(productComboxAmount + productGroupAmount * cartGoods.getQty());

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

@@ -44,14 +44,14 @@ public class TimeSalePromotionService implements IPromotionService {
         }
         String toastMsg = null;
         Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap = goodsList.parallelStream()
-                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
+                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getCartGoodsUid, Function.identity(), (k1, k2) -> k1));
         // 存储当前享受限时特价折扣的商品数量，key:goodsId; value:可享受数量
         Map<String, Integer> numberMap = new HashMap<>();
         List<Integer> discounts = Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode());
         String uid = "";
         for (CartGoods cartGoods : cartGoodsList) {
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods;
-            if ((goods = goodsMap.get(cartGoods.getGoodsId())) == null) {
+            if ((goods = goodsMap.get(cartGoods.getCartGoodsUid())) == null) {
                 continue;
             }
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = getGoodsDiscount(goods.getDiscounts(), discounts);