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

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

@@ -102,6 +102,7 @@ public class CalculationCommonService {
         long original = 0L;
         //
         for (CartGoods.ComboxGoods choice : cartGoods.getProductGroupList()) {
+            //可选搭配
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial mt = choices.get(choice.getGoodsId());
             if (mt == null) {
                 amount += choice.getAmount() * cartGoods.getQty();

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

@@ -118,23 +118,24 @@ public class FullSharingService {
                 if (!mDiscount.isEmpty()) continue;
                 for (CartGoods.ComboxGoods com : cart.getProductGroupList()) {
                     Long md = mDiscount.get(com.getGoodsId());
-                    if (md!=null) {
-                        com.setAmount(com.getAmount()+md);
+                    if (md != null) {
+                        com.setAmount(com.getAmount() + md);
+                        cart.setAmount(cart.getAmount() + md);
                     }
                 }
             }
             //固定搭配
-            if (CollectionUtils.isNotEmpty(cart.getProductComboList())) {
-                List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox> groupCom = discountMap.getGroupCombox();
-                HashMap<String, Long> gDiscount = drawnFullDiscount(groupCom, typeEnums);
-                if (!gDiscount.isEmpty()) continue;
-                for (CartGoods.ComboxGoods com : cart.getProductComboList()) {
-                    Long md = gDiscount.get(com.getGoodsId());
-                    if (md!=null) {
-                        com.setAmount(com.getAmount()+md);
-                    }
-                }
-            }
+            //if (CollectionUtils.isNotEmpty(cart.getProductComboList())) {
+            //    List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox> groupCom = discountMap.getGroupCombox();
+            //    HashMap<String, Long> gDiscount = drawnFullDiscount(groupCom, typeEnums);
+            //    if (!gDiscount.isEmpty()) continue;
+            //    for (CartGoods.ComboxGoods com : cart.getProductComboList()) {
+            //        Long md = gDiscount.get(com.getGoodsId());
+            //        if (md!=null) {
+            //            com.setAmount(com.getAmount()+md);
+            //        }
+            //    }
+            //}
         }
 
         /**