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

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

@@ -547,12 +547,13 @@ public class CouponServiceImpl implements CouponService {
             }
 
             totalAmount = totalAmount + product.getAmount() * cartGood.getQty();
-            if (CollectionUtils.isNotEmpty(cartGood.getProductMaterialList())) {
-                for (CartGoods.MaterialGoods materialGoods : cartGood.getProductMaterialList()) {
-                    product.setAmount(product.getAmount() + Integer.valueOf(materialGoods.getOriginalPrice() + ""));
-                    totalAmount = totalAmount + materialGoods.getOriginalPrice() * cartGood.getQty();
-                }
-            }
+            // todo ：小料价格累加到主商品上
+            //if (CollectionUtils.isNotEmpty(cartGood.getProductMaterialList())) {
+            //    for (CartGoods.MaterialGoods materialGoods : cartGood.getProductMaterialList()) {
+            //        product.setAmount(product.getAmount() + Integer.valueOf(materialGoods.getOriginalPrice() + ""));
+            //        totalAmount = totalAmount + materialGoods.getOriginalPrice() * cartGood.getQty();
+            //    }
+            //}
             // 数量
             product.setQuantity(cartGood.getQty());
             productList.add(product);

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

@@ -86,16 +86,19 @@ public class MaterialPromotionService implements IPromotionService {
                     pk = shoppingCartConvertAdapter.jointPk(product.getCartGoodsUid(), materialGoods.getSpuId());
                     MaterialApportion material = map.get(pk);
                     if (material != null && material.getApportionAmount().intValue() == 0) continue;
+                    List<ActivityDiscountsDto> activityDiscountsDtos = materialGoods.getActivityDiscountsDtos();
+                    if (CollectionUtils.isEmpty(activityDiscountsDtos)) {
+                        activityDiscountsDtos = new ArrayList<>();
+                    }
                     //设置行记录参加的活动及总优惠
                     ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                    List<ActivityDiscountsDto> activityDiscountsDtoList = new ArrayList<>();
                     activityDiscountsDto.setActivityCode(material.getDetails().activityCode);
                     activityDiscountsDto.setActivityName(material.getDetails().activityName);
                     activityDiscountsDto.setActivityType(material.getDetails().activityType);
                     activityDiscountsDto.setDiscountAmount(material.getApportionAmount());
-                    activityDiscountsDtoList.add(activityDiscountsDto);
+                    activityDiscountsDtos.add(activityDiscountsDto);
 
-                    materialGoods.setActivityDiscountsDtos(activityDiscountsDtoList);
+                    materialGoods.setActivityDiscountsDtos(activityDiscountsDtos);
                     //materialGoods.setTotalDiscountAmount((materialGoods.getOriginalPrice().intValue() - materialGoods.getSalePrice().intValue()) * product.getQty());
                     materialGoods.setTotalDiscountAmount(material.getTotalDiscountAmount());
                     product.setProductType(GoodsTypeEnum.MATERIAL.getGoodsType());

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

@@ -79,7 +79,10 @@ public class XyDiscountServiceImpl implements IPromotionService {
                 for (ApportionGoodsDetail detail : apportionGoodsDetail) {
                     if (detail.getCartGoodsUid().equals(product.getCartGoodsUid())) {
                         product.setTotalDiscountAmount(product.getTotalDiscountAmount() + detail.getActivityApportionAmount().intValue());
-                        List<ActivityDiscountsDto> activityDiscountsDtoList = new ArrayList<>();
+                        List<ActivityDiscountsDto> activityDiscountsDtoList = product.getActivityDiscountsDtos();
+                        if (CollectionUtils.isEmpty(activityDiscountsDtoList)) {
+                            activityDiscountsDtoList = new ArrayList<>();
+                        }
                         ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                         activityDiscountsDto.setActivityCode(detail.getActivityCode());
                         activityDiscountsDto.setActivityName(detail.getActivityName());
@@ -87,6 +90,7 @@ public class XyDiscountServiceImpl implements IPromotionService {
                         activityDiscountsDto.setDiscountAmount(detail.getActivityApportionAmount().intValue());
                         activityDiscountsDtoList.add(activityDiscountsDto);
                         product.setActivityDiscountsDtos(activityDiscountsDtoList);
+
                     }
                 }
             }