From 10a06cf876b3dfce68d36ee71cba0cb4fa393b94 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 04 Sep 2025 16:11:21 +0800
Subject: [PATCH] 计算金额(待补金额)
---
trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java b/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
index 6cebe22..91ffe36 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
@@ -95,9 +95,13 @@
model.setSubscriptionType(1);
}
+ Wallet wallet = walletService.saveWalletByPartyId(partyId);
+ if(wallet.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ throw new YamiShopBindException("请先缴清待补资金");
+ }
+
//需要先支付
if (ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) {
- Wallet wallet = walletService.saveWalletByPartyId(partyId);
if (amount.compareTo(wallet.getMoney()) > 0) {
throw new YamiShopBindException("余额不足");
}
@@ -154,21 +158,22 @@
if (model.getStatus() == 3) { //中签
//资金账户
Wallet wallet = walletService.saveWalletByPartyId(userId);
- int applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber();
- BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(applyNumber));
+ BigDecimal before = wallet.getMoney();
//已经预支付
if(ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) {
+ int applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber();
+ BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(applyNumber));
if(applyNumber > 0) {
//退回资金
BigDecimal refundPrice = ico.getUnitAmount().multiply(new BigDecimal(applyNumber));
- walletService.update(userId, refundPrice.doubleValue());
+ wallet = walletService.updateToBeCovered(wallet, refundPrice, 1);
//保存 资金日志
MoneyLog moneylog = new MoneyLog();
moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
- moneylog.setAmountBefore(wallet.getMoney());
+ moneylog.setAmountBefore(before);
moneylog.setAmount(amount);
- moneylog.setAmountAfter(wallet.getMoney().add(refundPrice));
+ moneylog.setAmountAfter(wallet.getMoney());
moneylog.setLog("新币购买，退回购买金额[" + refundPrice + "]");
moneylog.setUserId(userId);
moneylog.setSymbol(ico.getSymbol());
@@ -177,24 +182,15 @@
moneyLogService.save(moneylog);
}
} else {
- BigDecimal subtract = amount.subtract(wallet.getMoney());
- if (subtract.compareTo(BigDecimal.ZERO) > 0) {
- //放入待补
- wallet.setMoney(BigDecimal.ZERO);
- wallet.setAmountToBeCovered(subtract);
- if (!walletService.updateById(wallet)) {
- throw new YamiShopBindException("操作钱包失败!");
- }
- } else {
- //扣除资金
- walletService.update(userId, amount.negate().doubleValue());
- }
+ BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(model.getBallotNumber()));
+ wallet = walletService.updateToBeCovered(wallet, amount, 2);
+
//保存 资金日志
MoneyLog moneylog = new MoneyLog();
moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
- moneylog.setAmountBefore(wallet.getMoney());
+ moneylog.setAmountBefore(before);
moneylog.setAmount(amount);
- moneylog.setAmountAfter(subtract.compareTo(BigDecimal.ZERO) > 0 ? BigDecimal.ZERO : subtract.negate());
+ moneylog.setAmountAfter(wallet.getMoney());
moneylog.setLog("新币购买，申购金额[" + amount + "]");
moneylog.setUserId(userId);
moneylog.setSymbol(ico.getSymbol());
--
Gitblit v1.9.3