From 8a4d2b27e05d55be74dfdb870650a6b0f8cd9b45 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 二月 2025 13:48:39 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java
index 9237241..56ec0cb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java
@@ -47,10 +47,7 @@
public long caculateRentFee(TBill bill){
- return bill.getPayableFeesMoney().add(bill.getPayableFeesPenalty())
- .subtract(bill.getActualMoney())
- .multiply(AmountConstant.b100)
- .setScale(0, RoundingMode.HALF_DOWN)
+ return bill.getOutstandingMoney()
.longValue();
}
@@ -86,6 +83,7 @@
order.setAmount(dto.getAmount());
order.setUserId(user.getId());
order.setPhone(user.getPhone());
+ order.setOpenId(dto.getOpenId());
order.setUserName(user.getResidentName());
save(order);
TOrderBill tOrderBill = new TOrderBill();
@@ -119,6 +117,7 @@
order.setAmount(dto.getAmount());
order.setUserId(user.getId());
order.setPhone(user.getPhone());
+ order.setOpenId(dto.getOpenId());
order.setUserName(user.getResidentName());
save(order);
tOrderBillService.saveBatch(orderBills);
--
Gitblit v1.7.1