hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-31 18:28:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

会员：会员配置的积分相关字段加上point前缀

Browse Source
This commit is contained in:
owen
2023-10-01 10:41:21 +08:00
parent ab35fcbe9b
commit 2168145c3e
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointGiveCalculator.java
View File

@@ -34,8 +34,8 @@ public class TradePointGiveCalculator implements TradePriceCalculator {
public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
// 1.1 校验积分功能是否开启
int givePointPerYuan = Optional.ofNullable(memberConfigApi.getConfig())
.filter(config -> BooleanUtil.isTrue(config.getTradeDeductEnable()))
.map(MemberConfigRespDTO::getTradeGivePoint)
.filter(config -> BooleanUtil.isTrue(config.getPointTradeDeductEnable()))
.map(MemberConfigRespDTO::getPointTradeGivePoint)
.orElse(0);
if (givePointPerYuan <= 0) {
return;

12
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java
View File

@@ -78,18 +78,18 @@ public class TradePointUsePriceCalculator implements TradePriceCalculator {
private boolean isDeductPointEnable(MemberConfigRespDTO config) {
return config != null &&
!BooleanUtil.isTrue(config.getTradeDeductEnable()) && // 积分功能是否启用
config.getTradeDeductUnitPrice() != null && config.getTradeDeductUnitPrice() > 0; // 有没有配置：1 积分抵扣多少分
!BooleanUtil.isTrue(config.getPointTradeDeductEnable()) && // 积分功能是否启用
config.getPointTradeDeductUnitPrice() != null && config.getPointTradeDeductUnitPrice() > 0; // 有没有配置：1 积分抵扣多少分
}
private Integer calculatePointPrice(MemberConfigRespDTO config, Integer usePoint, TradePriceCalculateRespBO result) {
// 每个订单最多可以使用的积分数量
if (config.getTradeDeductMaxPrice() != null && config.getTradeDeductMaxPrice() > 0) {
usePoint = Math.min(usePoint, config.getTradeDeductMaxPrice());
if (config.getPointTradeDeductMaxPrice() != null && config.getPointTradeDeductMaxPrice() > 0) {
usePoint = Math.min(usePoint, config.getPointTradeDeductMaxPrice());
}
// TODO @疯狂：这里应该是，抵扣到只剩下 0.01；
// 积分优惠金额（分）
int pointPrice = usePoint * config.getTradeDeductUnitPrice();
int pointPrice = usePoint * config.getPointTradeDeductUnitPrice();
if (result.getPrice().getPayPrice() <= pointPrice) {
// 禁止 0 元购
throw exception(PRICE_CALCULATE_PAY_PRICE_ILLEGAL);
@@ -99,7 +99,7 @@ public class TradePointUsePriceCalculator implements TradePriceCalculator {
// pointPrice = result.getPrice().getPayPrice();
// // 反推需要扣除的积分
// usePoint = NumberUtil.toBigDecimal(pointPrice)
// .divide(NumberUtil.toBigDecimal(config.getTradeDeductUnitPrice()), 0, RoundingMode.HALF_UP)
// .divide(NumberUtil.toBigDecimal(config.getPointTradeDeductUnitPrice()), 0, RoundingMode.HALF_UP)
// .intValue();
// }
// 记录使用的积分