czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

回填退款前置

Browse Source
This commit is contained in:
wangw
2025-03-06 14:43:39 +08:00
parent f8793b483a
commit f340e84876
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-api/account-server/src/main/resources/application-test.yml
View File

@@ -30,6 +30,7 @@ dubbo:
name: account-server
qos-port: 22222
qos-enable: true
serialize-check-status: DISABLE
registry:
address: nacos://121.40.109.122:8848 # Nacos 服务地址
group: server-test

1
cash-api/order-server/src/main/resources/application-test.yml
View File

@@ -32,6 +32,7 @@ dubbo:
name: order-server
qos-port: 22232
qos-enable: true
serialize-check-status: DISABLE
registry:
address: nacos://121.40.109.122:8848 # Nacos 服务地址
group: server-test

24
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -300,18 +300,18 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
//减去满减优惠券
newTotalAmount = newTotalAmount.subtract(discountAmount.getPrice());
//积分抵扣 金额范围校验 抵扣金额校验
if (param.getPointsNum() > 0) {
if (pointSetting.getMinPaymentAmount().compareTo(newTotalAmount) > 0) {
throw new ValidateException("生成支付订单失败，未满足积分抵扣最低门槛");
}
if (pointSetting.getMaxDeductionRatio().multiply(newTotalAmount).compareTo(param.getPointsDiscountAmount()) < 0) {
throw new ValidateException("生成支付订单失败，积分抵扣金额已超出最大抵扣金额");
}
BigDecimal pointAmount = new BigDecimal(param.getPointsNum()).divide(new BigDecimal(pointSetting.getEquivalentPoints()), 2, RoundingMode.DOWN);
if (pointAmount.compareTo(param.getPointsDiscountAmount()) != 0) {
throw new ValidateException("生成支付订单失败，积分抵扣金额不正确");
}
}
// if (param.getPointsNum() > 0) {
// if (pointSetting.getMinPaymentAmount().compareTo(newTotalAmount) > 0) {
// throw new ValidateException("生成支付订单失败，未满足积分抵扣最低门槛");
// }
// if (pointSetting.getMaxDeductionRatio().multiply(newTotalAmount).compareTo(param.getPointsDiscountAmount()) < 0) {
// throw new ValidateException("生成支付订单失败，积分抵扣金额已超出最大抵扣金额");
// }
// BigDecimal pointAmount = new BigDecimal(param.getPointsNum()).divide(new BigDecimal(pointSetting.getEquivalentPoints()), 2, RoundingMode.DOWN);
// if (pointAmount.compareTo(param.getPointsDiscountAmount()) != 0) {
// throw new ValidateException("生成支付订单失败，积分抵扣金额不正确");
// }
// }
log.info("支付前置2，订单金额{} ", newTotalAmount);
newTotalAmount = newTotalAmount.subtract(param.getPointsDiscountAmount());
log.info("支付前置3，订单金额{} ", newTotalAmount);