Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa

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

@@ -47,7 +47,7 @@ public class MaterialPromotionService implements IPromotionService {
         if (map != null && !map.isEmpty()) {
             for (CartGoods cartGoods : cartGoodsList) {
                 //非正常商品
-                if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList()) || !cartGoods.getGoodsType().equals(GoodsTypeEnum.COMMON_GOODS.getGoodsType()))
+                if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList()))
                     continue;
                 for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
                     MaterialApportion apportion = map.get(materialGoods.getSpuId());
@@ -60,7 +60,7 @@ public class MaterialPromotionService implements IPromotionService {
         long materialAmount = 0L, materialOriginal = 0L;
 
         for (CartGoods cartGoods : cartGoodsList) {
-            if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList()) || !cartGoods.getGoodsType().equals(GoodsTypeEnum.COMMON_GOODS.getGoodsType()))
+            if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList()))
                 continue;
             materialAmount = 0L;
             materialOriginal = 0L;
@@ -86,10 +86,10 @@ public class MaterialPromotionService implements IPromotionService {
     @Override
     public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
         HashMap<String, MaterialApportion> map = getApportionGoodsDetail(calculationDiscountResult);
-        if (map == null && map.isEmpty()) return;
+        if (map == null || map.isEmpty()) return;
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> products = shoppingCartGoodsDto.getProducts();
         for (ShoppingCartGoodsDto.CartGoodsDetailDto product : products) {
-            if (CollectionUtils.isEmpty(product.getMaterialList()) || !product.getProductType().equals(GoodsTypeEnum.COMMON_GOODS.getGoodsType()))
+            if (CollectionUtils.isEmpty(product.getMaterialList()))
                 continue;
             for (ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods materialGoods : product.getMaterialList()) {
                 MaterialApportion material = map.get(materialGoods.getSpuId());