From da4961ad26c598fc2415940a7d3139d0e8d98fe6 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 12 Sep 2025 18:33:21 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/user/impl/UserStatisticsServiceImpl.java | 14 ++++++++++++++
trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java | 15 +++++++++++++++
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index 8e0eb85..0c175fe 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -1107,6 +1107,21 @@
lockMoney = Double.valueOf(map.get("lockMoney").toString());
freezeMoney = Double.valueOf(map.get("freezeMoney").toString());
walletService.updateWithLockAndFreeze(wallet.getUserId().toString(), changeMoney, lockMoney, freezeMoney);
+ }else if("capitalusdt".equals(coinType)){
+ CapitaltWallet capitaltWallet = capitaltWalletMapper.selectOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+ .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
+ amount_before = capitaltWallet.getMoney().doubleValue();
+ lock_amount_before = capitaltWallet.getLockMoney().doubleValue();
+ freeze_amount_before = capitaltWallet.getFreezeMoney().doubleValue();
+ Map<String, Object> map = checkChangeMoney(moneyRevise, resetType, amount_before, lock_amount_before, freeze_amount_before);
+ changeMoney = Double.valueOf(map.get("changeMoney").toString());
+ lockMoney = Double.valueOf(map.get("lockMoney").toString());
+ freezeMoney = Double.valueOf(map.get("freezeMoney").toString());
+
+ capitaltWallet.setMoney(new BigDecimal(Arith.add(capitaltWallet.getMoney().doubleValue(), changeMoney)));
+ capitaltWallet.setLockMoney(new BigDecimal(Arith.add(capitaltWallet.getLockMoney().doubleValue(), lockMoney)));
+ capitaltWallet.setFreezeMoney(new BigDecimal(Arith.add(capitaltWallet.getFreezeMoney().doubleValue(), freezeMoney)));
+ capitaltWalletMapper.updateById(capitaltWallet);
} else {
WalletExtend walletExtend = this.walletService.saveExtendByPara(partyId, coinType);
amount_before = walletExtend.getAmount();
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/user/impl/UserStatisticsServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/user/impl/UserStatisticsServiceImpl.java
index c04f7af..bdc27fc 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/user/impl/UserStatisticsServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/user/impl/UserStatisticsServiceImpl.java
@@ -1,10 +1,13 @@
package com.yami.trading.service.user.impl;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yami.trading.bean.model.CapitaltWallet;
import com.yami.trading.bean.model.Wallet;
import com.yami.trading.bean.model.WalletExtend;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.StringUtils;
+import com.yami.trading.service.CapitaltWalletService;
import com.yami.trading.service.WalletService;
import com.yami.trading.service.user.UserRecomService;
import com.yami.trading.service.user.UserStatisticsService;
@@ -26,6 +29,9 @@
UserRecomService userRecomService;
@Autowired
WalletService walletService;
+
+ @Autowired
+ CapitaltWalletService capitaltWalletService;
@Override
public List<Map<String,Object>> getAssetsAll(String loginPartyId,String targetPartyId) {
@@ -111,6 +117,14 @@
data.put("freeze_amount",null==wallet?0:wallet.getFreezeMoney().setScale(8, RoundingMode.FLOOR).toPlainString() );
result.add(0,data);
+ Map<String,Object> capitaldata = new HashMap<String,Object>();
+ CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+ .eq(CapitaltWallet::getUserId, targetPartyId).last(" limit 1 "));
+ capitaldata.put("capitalttype", "capitalusdt");
+ capitaldata.put("amount",null==capitaltWallet?0:new BigDecimal(capitaltWallet.getMoney().doubleValue()).setScale(8, RoundingMode.FLOOR).toPlainString() );
+ capitaldata.put("lock_amount",null==capitaltWallet?0:capitaltWallet.getLockMoney().setScale(8, RoundingMode.FLOOR).toPlainString() );
+ capitaldata.put("freeze_amount",null==capitaltWallet?0:capitaltWallet.getFreezeMoney().setScale(8, RoundingMode.FLOOR).toPlainString() );
+ result.add(0,capitaldata);
return result;
}
}
--
Gitblit v1.9.3