From 2cfba883471ec6dabd94ae07e5f7df5dc9df6912 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 14 Oct 2025 20:23:19 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCapitaltWalletWalletController.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCapitaltWalletWalletController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCapitaltWalletWalletController.java
index dfd5bcb..fd404e5 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCapitaltWalletWalletController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiCapitaltWalletWalletController.java
@@ -5,9 +5,11 @@
import com.yami.trading.admin.model.TransferModel;
import com.yami.trading.admin.model.UpdateWalltModel;
import com.yami.trading.bean.contract.domain.ContractOrder;
+import com.yami.trading.bean.data.domain.Realtime;
import com.yami.trading.bean.item.domain.Item;
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.annotation.SysLog;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.BusinessException;
@@ -18,12 +20,15 @@
import com.yami.trading.service.CapitaltWalletService;
import com.yami.trading.service.WalletService;
import com.yami.trading.service.contract.ContractOrderService;
+import com.yami.trading.service.data.DataService;
import com.yami.trading.service.user.UserService;
+import com.yami.trading.service.user.WalletExtendService;
import com.yami.trading.sys.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,10 +36,13 @@
import javax.validation.Valid;
import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @program: trading-order-master
@@ -57,7 +65,11 @@
@Autowired
private ContractOrderService contractOrderService;
+ @Autowired
+ WalletExtendService walletExtendService;
+ @Qualifier("dataService")
+ private DataService dataService;
@ApiOperation(value = "划转")
@@ -80,15 +92,23 @@
// 获取合约账户（contract）
Wallet wallet = walletService.saveWalletByPartyId(partyId);
// 获取资金账户（capital）
- CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
- .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
-
+// CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+// .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
+ List<WalletExtend> walletExtends = walletExtendService.findByUserId(partyId);
+ AtomicReference<BigDecimal> walletExtendMoneyRef = new AtomicReference<>(BigDecimal.ZERO);
+ walletExtends.forEach(f -> {
+ double closePrice = walletService.getRealtimePrice(f.getWallettype());
+ BigDecimal amount = new BigDecimal(String.valueOf(f.getAmount()));
+ BigDecimal price = new BigDecimal(String.valueOf(closePrice));
+ BigDecimal money = amount.multiply(price);
+ walletExtendMoneyRef.updateAndGet(current -> current.add(money));
+ });
+ BigDecimal walletExtendMoney = walletExtendMoneyRef.get();
Map<String, BigDecimal> assets = new HashMap<>();
- assets.put("contract",wallet.getMoney());
- assets.put("capital",capitaltWallet.getMoney());
+
+ assets.put("contract",wallet.getMoney().setScale(2,RoundingMode.DOWN));
+// assets.put("capital",capitaltWallet.getMoney().add(walletExtendMoney).setScale(2,RoundingMode.DOWN));
+// assets.put("capitalUSDT",capitaltWallet.getMoney());//划转专用
return Result.succeed(assets);
}
-
-
-
}
--
Gitblit v1.9.3