Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java

@@ -121,7 +121,7 @@ public class FullSharingService {
                         Long md = mDiscount.get(com.getGoodsId());
                         if (md != null) {
                             com.setAmount(com.getAmount() + md);
-                            cart.setAmount(cart.getAmount() + md);
+                            cart.setAmount(cart.getAmount() + com.getAmount());
                         }
                     }
                 }
@@ -312,14 +312,15 @@ public class FullSharingService {
      * 抽取满减的折扣金额 按货对应
      * 小料和可选搭配
      */
-    public HashMap<String, Long>  drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount,List<Integer> typeEnums,int type) {
+    public HashMap<String, Long> drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount, List<Integer> typeEnums, Integer type) {
         HashMap<String, Long> hashMap = new HashMap<>();
         if (CollectionUtils.isEmpty(materialDiscount)) return hashMap;
         for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial smallMaterial : materialDiscount) {
-            if (CollectionUtils.isEmpty(smallMaterial.getDiscounts())) continue;
+            if (CollectionUtils.isEmpty(smallMaterial.getDiscounts()) && !type.equals(smallMaterial.getType()))
+                continue;
             for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : smallMaterial.getDiscounts()) {
                 if (typeEnums.contains(discount.getType())) {
-                    hashMap.put(discount.getGoodsId(),discount.getDiscount());
+                    hashMap.put(discount.getGoodsId(), discount.getDiscount());
                 }
             }
         }