Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增优惠活动异常修复、软件购买计算赠送时间使用优惠活动的时长和单位完全匹配

Browse Source
This commit is contained in:
gaoqr
2025-11-04 14:37:01 +08:00
parent 44ddf171c9
commit 6d159ab429
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java
+4 -4
View File
@@ -63,8 +63,8 @@ public class ProductPromotionServiceImpl implements ProductPromotionService {
AssertUtils.empty(productPromotionDO, PRODUCT_PROMOTION_PURCHASEDURATION_IS_EXIST, createReqVO.getPurchaseDuration(), DurationUnitEnum.getDesc(createReqVO.getPurchaseDurationUnit())); AssertUtils.empty(productPromotionDO, PRODUCT_PROMOTION_PURCHASEDURATION_IS_EXIST, createReqVO.getPurchaseDuration(), DurationUnitEnum.getDesc(createReqVO.getPurchaseDurationUnit()));
ProductPromotionDO promotionDO = BeanUtils.toBean(createReqVO, ProductPromotionDO.class); ProductPromotionDO promotionDO = BeanUtils.toBean(createReqVO, ProductPromotionDO.class);
productPromotionDO.setProductId(productsDO.getId()); promotionDO.setProductId(productsDO.getId());
productPromotionDO.setProductName(productsDO.getProductName()); promotionDO.setProductName(productsDO.getProductName());
productPromotionMapper.insert(promotionDO); productPromotionMapper.insert(promotionDO);
return promotionDO.getId(); 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())); AssertUtils.empty(productPromotionDO, PRODUCT_PROMOTION_PURCHASEDURATION_IS_EXIST, updateReqVO.getPurchaseDuration(), DurationUnitEnum.getDesc(updateReqVO.getPurchaseDurationUnit()));
ProductPromotionDO promotionDO = BeanUtils.toBean(updateReqVO, ProductPromotionDO.class); ProductPromotionDO promotionDO = BeanUtils.toBean(updateReqVO, ProductPromotionDO.class);
productPromotionDO.setProductId(productsDO.getId()); promotionDO.setProductId(productsDO.getId());
productPromotionDO.setProductName(productsDO.getProductName()); promotionDO.setProductName(productsDO.getProductName());
productPromotionMapper.updateById(promotionDO); productPromotionMapper.updateById(promotionDO);
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java
+1 -9
View File
@@ -288,6 +288,7 @@ public class PayProductProcessorNew {
} }
/** /**
* 计算优惠活动赠送时长
* *
* @param duration * @param duration
* @param durationUnit * @param durationUnit
@@ -297,15 +298,6 @@ public class PayProductProcessorNew {
.filter(p -> duration.equals(p.getPurchaseDuration()) && durationUnit.equals(p.getPurchaseDurationUnit())) .filter(p -> duration.equals(p.getPurchaseDuration()) && durationUnit.equals(p.getPurchaseDurationUnit()))
.findFirst(); .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()) { if (availableProductPromotionOpt.isPresent()) {
ProductPromotionDO productPromotionDO = availableProductPromotionOpt.get(); ProductPromotionDO productPromotionDO = availableProductPromotionOpt.get();
productPromotionId = productPromotionDO.getId(); productPromotionId = productPromotionDO.getId();