From 4d099c31e09855ec4d54ab72e40062042feddad8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 23 四月 2025 10:55:40 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-admin/src/main/resources/application-prod.yml | 8 ++++----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index a62062f..768f958 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -220,11 +220,11 @@
client:
accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
-# bucket: xzgt-1305134071
+ bucket: xzgt-1305134071
bucketAddr: ap-chengdu
- bucket: xzgttest-1305134071
- rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
-# rootSrc: https://xzgt-1305134071.cos.ap-chengdu.myqcloud.com
+# bucket: xzgttest-1305134071
+# rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
+ rootSrc: https://xzgt-1305134071.cos.ap-chengdu.myqcloud.com
location: /xizang
sms:
enable: true
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index f3ece0a..23c3862 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -201,7 +201,7 @@
.subtract(save.getPayFeesMoney());
save.setOutstandingMoney(outstand);
//抵扣金额就是缴费金额
- save.setDeductionMoney(tBill.getPayableFeesMoney());
+ save.setDeductionMoney(tBill.getPayFeesMoney());
save.setPreOutstand(presist.getOutstandingMoney());
if (outstand.compareTo(BigDecimal.ZERO)<=0){
save.setPayFeesStatus("3");
--
Gitblit v1.7.1