From 9d0d1a29d7c114696dff97589a9b4a7cf5d1e693 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 09 Oct 2025 10:12:47 +0800
Subject: [PATCH] 注册绑定修复
---
trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java
index aff60f2..aaa0c4f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java
@@ -180,12 +180,12 @@
wallet.setMoney(wallet.getMoney().add(money));
if(wallet.getMoney().compareTo(BigDecimal.ZERO) < 0){
- wallet.setMoney(BigDecimal.ZERO);
- }
- wallet.setUpdateTime(now);
- if (wallet.getMoney().doubleValue() <= 0) {
throw new YamiShopBindException("余额不足");
}
+ wallet.setUpdateTime(now);
+ /*if (wallet.getMoney().doubleValue() < 0) {
+ throw new YamiShopBindException("余额不足");
+ }*/
updateById(wallet);
// 账变日志
MoneyLog moneyLog = new MoneyLog();
@@ -756,6 +756,36 @@
}
+ @Override
+ public Wallet updateToBeCovered(Wallet wallet, BigDecimal amount, Integer type) {
+ amount = amount.abs();
+ if (type == 1) { //入款
+ if(wallet.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ BigDecimal availableBalance = amount.subtract(wallet.getAmountToBeCovered());
+ if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
+ wallet.setMoney(wallet.getMoney().add(availableBalance));
+ wallet.setAmountToBeCovered(BigDecimal.ZERO);
+ }else {
+ wallet.setAmountToBeCovered(availableBalance.abs());
+ }
+ } else {
+ wallet.setMoney(wallet.getMoney().add(amount));
+ }
+ } else if (type == 2) { //扣款
+ BigDecimal subtract = amount.subtract(wallet.getMoney());
+ if (subtract.compareTo(BigDecimal.ZERO) > 0) { //资金不足 放入待补
+ wallet.setMoney(BigDecimal.ZERO);
+ wallet.setAmountToBeCovered(wallet.getAmountToBeCovered().add(subtract));
+ } else {
+ wallet.setMoney(subtract.negate());
+ }
+ }
+ if (!updateById(wallet)) {
+ throw new YamiShopBindException("操作钱包失败!");
+ }
+ return wallet;
+ }
+
@Override
public void updateExtendWithLockAndFreeze(String partyId, String walletType, double amount, double lockAmount, double freezeAmount) {
--
Gitblit v1.9.3