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

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -111,7 +111,7 @@ public class ShoppingCartConvertAdapter {
         } else if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
-        if (cartGoods.getProductMaterialList().size() > 0) {
+        if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
                 ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods goods = new ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods();

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

@@ -45,7 +45,7 @@ public class MaterialPromotionService implements IPromotionService {
         HashMap<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.Material> map = getApportionGoodsDetail(calculationDiscountResult);
         if (map != null && !map.isEmpty()) {
             for (CartGoods cartGoods : cartGoodsList) {
-                if (cartGoods.getProductMaterialList().size() == 0) continue;
+                if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList())) continue;
                 for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
                     ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.Material material = map.get(materialGoods.getMaterialId());
                     //设置小料行单价和行总价
@@ -59,7 +59,7 @@ public class MaterialPromotionService implements IPromotionService {
         long materialAmount = 0L, materialOriginal = 0L;
 
         for (CartGoods cartGoods : cartGoodsList) {
-            if (cartGoods.getProductMaterialList().size() == 0) continue;
+            if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList())) continue;
             materialAmount = 0L;
             materialOriginal = 0L;
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {

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

@@ -851,7 +851,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         calculationDiscountGoods.setMemberDiscount(cartGoods.getMemberDiscount());
 
         //加料
-        if (cartGoods.getProductMaterialList().size() > 0) {
+        if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
             ArrayList<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material> materials = new ArrayList<>();
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {