Merge branch 'dev_20251130' of https://git.sckaiwu.cn/kaiwu-rep/sckw-service-platform into dev_20251130

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/wallet/KwpBizWalletService.java

@@ -498,7 +498,7 @@ public class KwpBizWalletService {
         kwpBizWalletPrepay.setAmount(one.getAmount());
         kwpBizWalletPrepay.setPrepayAmount(one.getPrepayAmount());
         kwpBizWalletPrepay.setType(2);
-        kwpBizWalletPrepay.setRemark(StrUtil.format("[订单号：%s]冻结", walletFreeze.getOrderNo()));
+        kwpBizWalletPrepay.setRemark(StrUtil.format("[订单号：{}]冻结", walletFreeze.getOrderNo()));
         kwpBizWalletPrepay.setVoucherUrl("");
         kwpBizWalletPrepay.setCreateTime(new Date());
         kwpBizWalletPrepay.setUpdateTime(new Date());
@@ -536,7 +536,7 @@ public class KwpBizWalletService {
         kwpBizWalletPrepay.setAmount(amount);
         kwpBizWalletPrepay.setPrepayAmount(NumberUtil.sub(wallet.getPrepayAmount(), changeAmount));
         kwpBizWalletPrepay.setType(3);
-        kwpBizWalletPrepay.setRemark(StrUtil.format("[%s][结算]解冻订单总金额", walletFreeze.getOrderNo()));
+        kwpBizWalletPrepay.setRemark(StrUtil.format("[{}][结算]解冻订单总金额", walletFreeze.getOrderNo()));
         kwpBizWalletPrepay.setVoucherUrl("");
         kwpBizWalletPrepay.setCreateTime(new Date());
         kwpBizWalletPrepay.setUpdateTime(new Date());
@@ -552,7 +552,7 @@ public class KwpBizWalletService {
         kwpBizWalletPrepay2.setAmount(NumberUtil.sub(amount, walletFreeze.getMoney()));
         kwpBizWalletPrepay2.setPrepayAmount(kwpBizWalletPrepay.getPrepayAmount());
         kwpBizWalletPrepay2.setType(4);
-        kwpBizWalletPrepay2.setRemark(StrUtil.format("[%s][结算]扣除订单总金额", walletFreeze.getOrderNo()));
+        kwpBizWalletPrepay2.setRemark(StrUtil.format("[{}][结算]扣除订单总金额", walletFreeze.getOrderNo()));
         kwpBizWalletPrepay2.setVoucherUrl("");
         kwpBizWalletPrepay2.setCreateTime(new Date());
         kwpBizWalletPrepay2.setUpdateTime(new Date());
@@ -595,7 +595,7 @@ public class KwpBizWalletService {
         kwpBizWalletPrepay.setAmount(amount);
         kwpBizWalletPrepay.setPrepayAmount(NumberUtil.sub(wallet.getPrepayAmount(), changeAmount));
         kwpBizWalletPrepay.setType(3);
-        kwpBizWalletPrepay.setRemark(StrUtil.format("[订单号：%s]解冻", walletFreeze.getOrderNo()));
+        kwpBizWalletPrepay.setRemark(StrUtil.format("[订单号：{}]解冻", walletFreeze.getOrderNo()));
         kwpBizWalletPrepay.setVoucherUrl("");
         kwpBizWalletPrepay.setCreateTime(new Date());
         kwpBizWalletPrepay.setUpdateTime(new Date());