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

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

@@ -460,7 +460,7 @@ public class CalculationCommonService {
      */
     private List<ActivityDiscountsDto> drawSmallDiscount(List<Discounts> discounts) {
         List<ActivityDiscountsDto> activityDiscountsDto = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(discounts)) return activityDiscountsDto;
+        if (CollectionUtils.isEmpty(discounts)) return activityDiscountsDto;
         for (Discounts discount : discounts) {
             ActivityDiscountsDto dto = new ActivityDiscountsDto();
             dto.setActivityName(discount.getActivityName());
@@ -542,6 +542,7 @@ public class CalculationCommonService {
                 }
                 blockRow.setDiscounts(discounts);
                 blockRows.add(blockRow);
+                map.put(sm.getGoodsId(), blockRow);
             }
         }
         return map;

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

@@ -7,6 +7,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.enums.CalculationGoodsType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.impl.AssortmentSdkService;
@@ -67,21 +68,19 @@ public class GiftSharingService {
         if (CollectionUtils.isEmpty(discountResult.getGoods())) {
             return gifts;
         }
-        Integer giftType = 1;
         gifts = discountResult.getGoods()
                 .stream()
-                .filter(d -> giftType.equals(d.getCartGoodType()))
+                .filter(d -> CalculationGoodsType.TYPE_1.getType().equals(d.getCartGoodType()))
                 .map(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId)
                 .collect(Collectors.toList());
         return gifts;
     }
 
     public Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> getDiscountForGift(CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult) {
-        Integer giftType = 1;
 
         Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> gifts = discountResult.getGoods()
                 .stream()
-                .filter(d -> giftType.equals(d.getCartGoodType()))
+                .filter(d -> CalculationGoodsType.TYPE_1.getType().equals(d.getCartGoodType()))
                 .collect(Collectors.toMap(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
         return gifts;
     }
@@ -230,6 +229,7 @@ public class GiftSharingService {
                 dto.setActualActivityGoodsNumber(discount.getActualGoodsNumber());
                 activityDto.add(dto);
                 cartGoodsDetailDto.setActivityDiscountsDtos(activityDto);
+                manyCartGoodsDetailDto.add(cartGoodsDetailDto);
             }
             cartGoodsDetailDtoList.addAll(manyCartGoodsDetailDto);
         }