Merge branch '2020/09/24-运费券-huiyang' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -81,7 +81,7 @@ public class CouponDiscountCalculation {
         }
 
         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));
 
         for (CartGoods cartGoods : cartGoodsList) {
             //商品券商品
@@ -100,11 +100,11 @@ public class CouponDiscountCalculation {
 //                        cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
 //                    }
 //                }
-                if (goodsMap.get(cartGoods.getGoodsId()) == null) {
+                if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
                     continue;
                 }
-                cartGoods.setAmount(goodsMap.get(cartGoods.getGoodsId()).getRealAmount());
-                List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discounts = goodsMap.get(cartGoods.getGoodsId()).getDiscounts();
+                cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
+                List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discounts = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
                 if (CollectionUtils.isNotEmpty(discounts)) {
                     ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discounts.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get();
                     cartGoods.setCouponName(goodsDiscount.getActivityName());
@@ -149,7 +149,7 @@ public class CouponDiscountCalculation {
         }
 
         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));
 
         for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
             //商品券商品
@@ -172,14 +172,14 @@ public class CouponDiscountCalculation {
                     }
                 }
 
-                if (goodsMap.get(cartGoods.getSkuId()) == null) {
+                if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
                     continue;
                 }
                 //商品券键位编号为空
-                if(StringUtils.isBlank(goodsMap.get(cartGoods.getSkuId()).getArtNo())){
+                if(StringUtils.isBlank(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo())){
                     throw new ServiceException(ResponseResult.SHOPPING_CART_SEAT_EMPTY);
                 }
-                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getSkuId()).getArtNo());
+                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
             }
         }