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

@@ -107,8 +107,7 @@ public class MaterialPromotionService implements IPromotionService {
                         }
                     }
                     materialGoods.setActivityDiscountsDtos(activityDiscountsDtos);
-                    //materialGoods.setTotalDiscountAmount((materialGoods.getOriginalPrice().intValue() - materialGoods.getSalePrice().intValue()) * product.getQty());
-                    materialGoods.setTotalDiscountAmount(material.getTotalDiscountAmount());
+                    materialGoods.setTotalDiscountAmount(material.getTotalDiscountAmount() * (material.getQty() == product.getQty() ? 1 : product.getQty()));
                     product.setProductType(GoodsTypeEnum.MATERIAL.getGoodsType());
                 }
             }
@@ -149,8 +148,8 @@ public class MaterialPromotionService implements IPromotionService {
                     materialApportion.setApportionAmount(material.getApportionAmount() * material.getGoodsQuantity());
                     materialApportion.setGoodsId(material.getGoodsId());
                     materialApportion.setTotalDiscountAmount(material.getApportionAmount() * material.getGoodsQuantity());
+                    materialApportion.setQty(material.getGoodsQuantity());
                     materialApportion.setPk(pk);
-                    //ApportionDetails apportionDetails = new ApportionDetails();
                     ArrayList<ApportionDetails> apportionDetailsList = new ArrayList<>();
                     if (CollectionUtils.isNotEmpty(material.getApportionDetails())) {
                         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails apportionDetail : material.getApportionDetails()) {
@@ -168,6 +167,7 @@ public class MaterialPromotionService implements IPromotionService {
                 MaterialApportion apportion = mApportion.get(pk);
                 apportion.setApportionAmount(apportion.getApportionAmount() + material.getApportionAmount() * material.getGoodsQuantity());
                 apportion.setTotalDiscountAmount(apportion.getTotalDiscountAmount() + material.getApportionAmount() * material.getGoodsQuantity());
+                apportion.setQty(apportion.getQty() + material.getGoodsQuantity());
                 List<ApportionDetails> details = apportion.getDetails();
                 for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails apportionDetail : material.getApportionDetails()) {
                     if (apportion.getDetails().stream().filter(e -> e.getActivityCode().equals(apportionDetail.getActivityCode())).count() == 0) {
@@ -195,6 +195,7 @@ public class MaterialPromotionService implements IPromotionService {
         private Integer totalDiscountAmount;
         private List<ApportionDetails> details;
         private String pk;
+        private Integer qty;
     }
 
     @Data