gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
赵忠林
2025-07-29 00:32:13 +08:00
parent 71483f272d aecfea75f2
commit f62b8997ca
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
View File

@@ -112,11 +112,13 @@ public class OrderPayController extends BaseController {
final BigDecimal batteryRent = goods.getBatteryRent(); final BigDecimal batteryRent = goods.getBatteryRent();
// 按新的续费价格 // 按新的续费价格
orderPay.setTotalPrice(batteryRent); orderPay.setTotalPrice(batteryRent);
if (one != null) {
final long between = DateUtil.between(new Date(), one.getExpirationTime(), DateUnit.DAY, false); final long between = DateUtil.between(new Date(), one.getExpirationTime(), DateUnit.DAY, false);
if (between < 0) { if (between < 0) {
// 有逾期的订单不能享受折扣 // 有逾期的订单不能享受折扣
orderPay.setTotalPrice(rent); orderPay.setTotalPrice(rent);
} }
}
return success(orderPay); return success(orderPay);
} }