diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java index 784e4617c..f8923f812 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java @@ -63,8 +63,8 @@ public class ProductPromotionServiceImpl implements ProductPromotionService { AssertUtils.empty(productPromotionDO, PRODUCT_PROMOTION_PURCHASEDURATION_IS_EXIST, createReqVO.getPurchaseDuration(), DurationUnitEnum.getDesc(createReqVO.getPurchaseDurationUnit())); ProductPromotionDO promotionDO = BeanUtils.toBean(createReqVO, ProductPromotionDO.class); - productPromotionDO.setProductId(productsDO.getId()); - productPromotionDO.setProductName(productsDO.getProductName()); + promotionDO.setProductId(productsDO.getId()); + promotionDO.setProductName(productsDO.getProductName()); productPromotionMapper.insert(promotionDO); return promotionDO.getId(); } @@ -95,8 +95,8 @@ public class ProductPromotionServiceImpl implements ProductPromotionService { AssertUtils.empty(productPromotionDO, PRODUCT_PROMOTION_PURCHASEDURATION_IS_EXIST, updateReqVO.getPurchaseDuration(), DurationUnitEnum.getDesc(updateReqVO.getPurchaseDurationUnit())); ProductPromotionDO promotionDO = BeanUtils.toBean(updateReqVO, ProductPromotionDO.class); - productPromotionDO.setProductId(productsDO.getId()); - productPromotionDO.setProductName(productsDO.getProductName()); + promotionDO.setProductId(productsDO.getId()); + promotionDO.setProductName(productsDO.getProductName()); productPromotionMapper.updateById(promotionDO); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java index 12ecad00b..a51f6256e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java @@ -288,6 +288,7 @@ public class PayProductProcessorNew { } /** + * 计算优惠活动赠送时长 * * @param duration * @param durationUnit @@ -297,15 +298,6 @@ public class PayProductProcessorNew { .filter(p -> duration.equals(p.getPurchaseDuration()) && durationUnit.equals(p.getPurchaseDurationUnit())) .findFirst(); - if (availableProductPromotionOpt.isEmpty()) { - // 没有精确匹配时,找同单位中 purchaseDuration 与 duration 差值最小的 - availableProductPromotionOpt = availableProductPromotionList.stream() - .filter(p -> durationUnit.equals(p.getPurchaseDurationUnit())) - .min(Comparator.comparing(p -> BigDecimal.valueOf( - Math.abs(p.getPurchaseDuration() - duration)) - )); - } - if (availableProductPromotionOpt.isPresent()) { ProductPromotionDO productPromotionDO = availableProductPromotionOpt.get(); productPromotionId = productPromotionDO.getId();