Skip to content

O
order-group
Commit 8edde060 by xiaoer.li
Options

update::满赠

parent 0675902f
Showing with 8 additions and 8 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java
...@@ -50,7 +50,9 @@ public class BuyAndGiftsPromotionService implements IPromotionService { ...@@ -50,7 +50,9 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getSendGoods())) { if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getSendGoods())) {
return; return;
} }
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendActivities = calculationDiscountResult.getSendGoods().stream().filter(goods -> ActivityTypeEnum.TYPE_62.getCode().equals(goods.getActivityType())).collect(Collectors.toList()); List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendActivities = calculationDiscountResult.getSendGoods().stream()
.filter(goods -> (ActivityTypeEnum.TYPE_62.getCode().equals(goods.getActivityType())) || (ActivityTypeEnum.TYPE_230.getCode().equals(goods.getActivityType())))
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(sendActivities)) { if (CollectionUtils.isEmpty(sendActivities)) {
return; return;
} }
...@@ -83,7 +85,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService { ...@@ -83,7 +85,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
cartGoods.setCategoryName(product.getName()); cartGoods.setCategoryName(product.getName());
cartGoods.setPic(product.getPicture()); cartGoods.setPic(product.getPicture());
cartGoods.setSkuName(product.getName()); cartGoods.setSkuName(product.getName());
cartGoods.setActivityType(ActivityTypeEnum.TYPE_62.getCode()); cartGoods.setActivityType(Integer.parseInt(sendActivity.getActivityCode()));
cartGoods.setStockLimit(ObjectUtils.equals(1, product.getStockLimit())); cartGoods.setStockLimit(ObjectUtils.equals(1, product.getStockLimit()));
cartGoods.setCustomerCode(product.getCustomerCode()); cartGoods.setCustomerCode(product.getCustomerCode());
cartGoods.setUnit(product.getUnit()); cartGoods.setUnit(product.getUnit());
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
...@@ -60,8 +60,7 @@ public class BuySendPromotionService implements IPromotionService { ...@@ -60,8 +60,7 @@ public class BuySendPromotionService implements IPromotionService {
return; return;
} }
//Todo 获取多个赠品list //Todo 获取多个赠品list
List<Integer> integers = Arrays.asList(ActivityTypeEnum.TYPE_61.getCode(), ActivityTypeEnum.TYPE_230.getCode()); List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendActivityLists = getSendActivityList(ActivityTypeEnum.TYPE_61,, sendActivityList);
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendActivityLists = getSendActivityList(integers, sendActivityList);
//Todo 获取多个赠品list //Todo 获取多个赠品list
if (sendActivityLists.size() == 0) { if (sendActivityLists.size() == 0) {
...@@ -204,9 +203,9 @@ public class BuySendPromotionService implements IPromotionService { ...@@ -204,9 +203,9 @@ public class BuySendPromotionService implements IPromotionService {
* @param type * @param type
* @return * @return
*/ */
private List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> getSendActivityList(List<Integer> type, private List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> getSendActivityList(ActivityTypeEnum type,
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendActivityList) { List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendActivityList) {
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> collect = sendActivityList.stream().filter(c ->type.contains(c.getActivityType())).collect(Collectors.toList()); List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> collect = sendActivityList.stream().filter(c -> c.getActivityType().equals(type.getCode())).collect(Collectors.toList());
return collect; return collect;
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -1456,8 +1456,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1456,8 +1456,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getSendGoods())) { if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getSendGoods())) {
if (calculationDiscountResult.getSendGoods().stream() if (calculationDiscountResult.getSendGoods().stream()
.anyMatch(sendActivity -> Objects.equals(sendActivity.getActivityType(), ActivityTypeEnum.TYPE_6.getCode()) .anyMatch(sendActivity -> Objects.equals(sendActivity.getActivityType(), ActivityTypeEnum.TYPE_6.getCode())
|| Objects.equals(sendActivity.getActivityType(), ActivityTypeEnum.TYPE_61.getCode()) || Objects.equals(sendActivity.getActivityType(), ActivityTypeEnum.TYPE_61.getCode()))) {
|| Objects.equals(sendActivity.getActivityType(), ActivityTypeEnum.TYPE_230.getCode()))) {
// 买赠 // 买赠
BuySendPromotionService buySendPromotionService = (BuySendPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.BUY_ONE_SEND); BuySendPromotionService buySendPromotionService = (BuySendPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.BUY_ONE_SEND);
buySendPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo); buySendPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment