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

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

@@ -110,7 +110,7 @@ public class CalculationSharingCartService {
         if (ShoppingCartConstant.ADD_AND_UPDATE.equals(opt)) {
             calculationCommonService.setAddAndUpdateResponse(cartGoodsList, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo, ShoppingCartConstant.ADD_AND_UPDATE);
         } else if (ShoppingCartConstant.QUERY_INFO.equals(opt)) {
-            calculationCommonService.setAddAndUpdateResponse(cartGoodsList, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo, ShoppingCartConstant.ADD_AND_UPDATE);
+            calculationCommonService.setAddAndUpdateResponse(cartGoodsList, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo, ShoppingCartConstant.QUERY_INFO);
             calculationCommonService.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
         }
 

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

@@ -212,7 +212,7 @@ public class CalculationSharingDiscountService {
                 material.setType(2);
                 material.setGoodsId(group.getGoodsId());
                 material.setGoodsQuantity(1);
-                material.setOriginalPrice(group.getOriginalPrice());
+                material.setOriginalPrice(group.getFinalPrice());
                 groups.add(material);
             }
             calculationDiscountGoods.setSmallMaterial(groups);

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

@@ -48,6 +48,22 @@ public class FullSharingService {
         if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
             return;
         }
+
+        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
+        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> fullDiscountsList = discounts
+                .stream()
+                .filter(d -> d.getType().equals(ActivityTypeEnum.TYPE_11.getCode()) || d.getType().equals(ActivityTypeEnum.TYPE_12))
+                .collect(Collectors.toList());
+        /**
+         * 设置到响应中 总的满减优惠金额
+         */
+        if (CollectionUtils.isNotEmpty(fullDiscountsList)) {
+
+            long fullDiscount = 0L;
+            fullDiscount = fullDiscountsList.stream().filter(d -> d.getDiscount() != null).mapToLong(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount::getDiscount).sum();
+            shoppingCartGoodsResponseVo.setFullDiscount(fullDiscount);
+        }
+
         shoppingCartGoodsResponseVo.setActivityTip(new ActivityTip());
         List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
         /**
@@ -55,6 +71,8 @@ public class FullSharingService {
          */
         activityTypeEnums.add(ActivityTypeEnum.TYPE_11);
         activityTypeEnums.add(ActivityTypeEnum.TYPE_12);
+        activityTypeEnums.add(ActivityTypeEnum.TYPE_3);
+        activityTypeEnums.add(ActivityTypeEnum.TYPE_31);
         List<Integer> typeEnums = activityTypeEnums.stream().map(ActivityTypeEnum::getCode).collect(Collectors.toList());
         /**
          * 还原满减折扣到行记录上
@@ -145,7 +163,7 @@ public class FullSharingService {
         else {
             //促销返回满减提示语
             List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.ActivityPrompt> activityPrompts = discountResult.getActivityPrompts();
-            List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
+            //List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
             /**
              * 构建提示语
              */
@@ -167,30 +185,6 @@ public class FullSharingService {
         if (discountResult == null){
             return;
         }
-
-        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
-        if (CollectionUtils.isNotEmpty(discounts)) {
-            return;
-        }
-        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> fullDiscountsList = discounts
-                .stream()
-                .filter(d -> d.getType().equals(ActivityTypeEnum.TYPE_11.getCode()) || d.getType().equals(ActivityTypeEnum.TYPE_12))
-                .collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(fullDiscountsList)) {
-            return;
-        }
-        /**
-         * 总的满减优惠金额
-         */
-        long fullDiscount = 0L;
-        fullDiscount = fullDiscountsList.stream().filter(d->d.getDiscount()!=null).mapToLong(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount::getDiscount).sum();
-
-        /**
-         * 设置到响应中
-         */
-        shoppingCartGoodsResponseVo.setFullDiscount(fullDiscount);
-
-
     }
 
     /**