Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang i...

xuhy

2025-04-23 4d099c31e09855ec4d54ab72e40062042feddad8

Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev

 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

 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");