2 Commits f31defeeea ... e0956ae553

Autore SHA1 Messaggio Data
  xucaiqin e0956ae553 Merge remote-tracking branch 'origin/dev_20251130' into dev_20251130 2 settimane fa
  xucaiqin fe45e693d2 fix 2 settimane fa

+ 3 - 3
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dubbo/PaymentDubboServiceImpl.java

@@ -305,7 +305,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
         //新增解冻订单
         amount = NumberUtil.add(amount, changeAmount);
         KwpBizWalletPrepay kwpBizWalletPrepay = new KwpBizWalletPrepay();
-        kwpBizWalletPrepay.setWalletId(one.getId());
+        kwpBizWalletPrepay.setWalletId(wallet.getId());
         kwpBizWalletPrepay.setOrderId(walletFreeze.getTTradeOrderId());
         kwpBizWalletPrepay.setChangeAmount(changeAmount);
         kwpBizWalletPrepay.setAmount(amount);
@@ -321,7 +321,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
 
         //新增消费订单
         KwpBizWalletPrepay kwpBizWalletPrepay2 = new KwpBizWalletPrepay();
-        kwpBizWalletPrepay2.setWalletId(one.getId());
+        kwpBizWalletPrepay2.setWalletId(wallet.getId());
         kwpBizWalletPrepay2.setOrderId(walletFreeze.getTTradeOrderId());
         kwpBizWalletPrepay2.setChangeAmount(walletFreeze.getMoney());
         kwpBizWalletPrepay2.setAmount(NumberUtil.sub(amount, walletFreeze.getMoney()));
@@ -365,7 +365,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
         //新增解冻订单
         amount = NumberUtil.add(amount, changeAmount);
         KwpBizWalletPrepay kwpBizWalletPrepay = new KwpBizWalletPrepay();
-        kwpBizWalletPrepay.setWalletId(one.getId());
+        kwpBizWalletPrepay.setWalletId(wallet.getId());
         kwpBizWalletPrepay.setOrderId(walletFreeze.getTTradeOrderId());
         kwpBizWalletPrepay.setChangeAmount(changeAmount);
         kwpBizWalletPrepay.setAmount(amount);