From 8c62c4f079fccdcce584a458a7b9741edbe34721 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 10 Aug 2025 23:47:58 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 c1acf6d..06cbca9 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
@@ -2,6 +2,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,6 +15,7 @@
import com.yami.trading.bean.future.domain.FuturesOrder;
import com.yami.trading.bean.future.domain.FuturesRedisKeys;
import com.yami.trading.bean.item.domain.Item;
+import com.yami.trading.bean.model.CapitaltWallet;
import com.yami.trading.bean.model.MoneyLog;
import com.yami.trading.bean.model.Wallet;
import com.yami.trading.bean.model.WalletExtend;
@@ -25,7 +27,9 @@
import com.yami.trading.common.util.Arith;
import com.yami.trading.common.util.RedisUtil;
import com.yami.trading.common.util.StringUtils;
+import com.yami.trading.dao.CapitaltWalletMapper;
import com.yami.trading.dao.user.WalletMapper;
+import com.yami.trading.service.CapitaltWalletService;
import com.yami.trading.service.MoneyLogService;
import com.yami.trading.service.WalletService;
import com.yami.trading.service.contract.ContractApplyOrderService;
@@ -70,7 +74,8 @@
@Autowired
MoneyLogService moneyLogService;
-
+ @Autowired
+ CapitaltWalletMapper capitaltWalletMapper;
@Autowired
RedisTemplate redisTemplate;
@@ -177,7 +182,7 @@
wallet.setMoney(BigDecimal.ZERO);
}
wallet.setUpdateTime(now);
- if (wallet.getMoney().doubleValue() < 0) {
+ if (wallet.getMoney().doubleValue() <= 0) {
throw new YamiShopBindException("余额不足");
}
updateById(wallet);
@@ -305,8 +310,10 @@
if (!"".equals(partyId) && partyId != null) {
wallet = findByUserId(partyId.toString());
}
+ CapitaltWallet userIdWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<CapitaltWallet>()
+ .eq(CapitaltWallet::getUserId,partyId.toString()));
moneys_contract.put("money_wallet", wallet.getMoney().doubleValue());//可用余额
- moneys_contract.put("money_contract", wallet.getMoney().doubleValue()+money_contract);
+ moneys_contract.put("money_contract", userIdWallet.getMoney().doubleValue()+wallet.getMoney().doubleValue()+money_contract);
return moneys_contract;
}
--
Gitblit v1.9.3