From 463956a90a34ee6dd60ae4a3615b45ab4eae44ab Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 18 Sep 2025 13:52:33 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java | 91 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 34 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 3bb5ed7..20741b1 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,21 +95,29 @@
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) {
+ //手续费
+ BigDecimal fee = ico.getUnitFee().multiply(new BigDecimal(model.getSubscribeNums()));
+ BigDecimal totalAmount = amount.add(fee);
+ if (totalAmount.compareTo(wallet.getMoney()) > 0) {
throw new YamiShopBindException("余额不足");
}
- walletService.update(partyId, Arith.sub(0, amount.doubleValue()));
+ BigDecimal before = wallet.getMoney();
+ walletService.update(partyId, totalAmount.negate().doubleValue());
// 保存 资金日志
MoneyLog moneylog = new MoneyLog();
moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
- moneylog.setAmountBefore(wallet.getMoney());
- moneylog.setAmount(amount);
- moneylog.setAmountAfter(BigDecimal.valueOf(Arith.sub(wallet.getMoney().doubleValue(), amount.doubleValue())));
- moneylog.setLog("新币购买，申购金额[" + amount + "]");
+ moneylog.setAmountBefore(before);
+ moneylog.setAmount(totalAmount.negate());
+ moneylog.setAmountAfter(before.subtract(totalAmount));
+ moneylog.setLog("新币购买，申购金额[" + amount + "]" + "手续费金额[" + fee + "]");
moneylog.setUserId(partyId);
moneylog.setSymbol(ico.getSymbol());
moneylog.setWalletType(ico.getSymbol());
@@ -136,7 +144,7 @@
if (userSubscription.getStatus() == 5) {
throw new YamiShopBindException("It's been converted");
}
- if(userSubscription.getStatus() == 3){
+ if(userSubscription.getStatus() == 3 || userSubscription.getStatus() == 2){
throw new YamiShopBindException("不能更改申购状态");
}
Ico ico = this.getById(userSubscription.getIcoProjectId());
@@ -151,25 +159,48 @@
}
userSubscription.setStatus(model.getStatus());
userSubscription.setBallotNumber(model.getBallotNumber());
- if (model.getStatus() == 3) { //中签
- //资金账户
- Wallet wallet = walletService.saveWalletByPartyId(userId);
+
+ //资金账户
+ Wallet wallet = walletService.saveWalletByPartyId(userId);
+ BigDecimal before = wallet.getMoney();
+ if (model.getStatus() == 2) { //未中签
+ //预支付退回全部资金
+ if(ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) {
+ BigDecimal refundPrice = ico.getUnitAmount().multiply(new BigDecimal(userSubscription.getSubscribeNums()));
+ BigDecimal fee = ico.getUnitFee().multiply(new BigDecimal(userSubscription.getSubscribeNums()));
+ BigDecimal totalAmount = refundPrice.add(fee);
+ wallet = walletService.updateToBeCovered(wallet, totalAmount, 1);
+ //保存 资金日志
+ MoneyLog moneylog = new MoneyLog();
+ moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
+ moneylog.setAmountBefore(before);
+ moneylog.setAmount(totalAmount);
+ moneylog.setAmountAfter(wallet.getMoney());
+ moneylog.setLog("新币未中签，退回金额[" + refundPrice + "]" + "退回手续费[" + fee + "]");
+ moneylog.setUserId(userId);
+ moneylog.setSymbol(ico.getSymbol());
+ moneylog.setWalletType(ico.getSymbol());
+ moneylog.setContentType(Constants.MONEYLOG_CONTENT_NEW_COIN_RT_BUY);
+ moneyLogService.save(moneylog);
+ }
+ } else if (model.getStatus() == 3) { //中签
//已经预支付
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());
+ BigDecimal fee = ico.getUnitFee().multiply(new BigDecimal(applyNumber));
+ BigDecimal totalAmount = refundPrice.add(fee);
+ wallet = walletService.updateToBeCovered(wallet, totalAmount, 1);
//保存 资金日志
MoneyLog moneylog = new MoneyLog();
moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
- moneylog.setAmountBefore(wallet.getMoney());
- moneylog.setAmount(amount);
- moneylog.setAmountAfter(wallet.getMoney().add(refundPrice));
- moneylog.setLog("新币购买，退回购买金额[" + refundPrice + "]");
+ moneylog.setAmountBefore(before);
+ moneylog.setAmount(totalAmount);
+ moneylog.setAmountAfter(wallet.getMoney());
+ moneylog.setLog("新币购买，退回金额[" + refundPrice + "]" + "退回手续费[" + fee + "]");
moneylog.setUserId(userId);
moneylog.setSymbol(ico.getSymbol());
moneylog.setWalletType(ico.getSymbol());
@@ -178,25 +209,17 @@
}
} else {
BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(model.getBallotNumber()));
- 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 fee = ico.getUnitFee().multiply(new BigDecimal(model.getBallotNumber()));
+ BigDecimal totalAmount = amount.add(fee);
+ wallet = walletService.updateToBeCovered(wallet, totalAmount, 2);
//保存 资金日志
MoneyLog moneylog = new MoneyLog();
moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
- moneylog.setAmountBefore(wallet.getMoney());
- moneylog.setAmount(amount);
- moneylog.setAmountAfter(subtract.compareTo(BigDecimal.ZERO) > 0 ? BigDecimal.ZERO : subtract.negate());
- moneylog.setLog("新币购买，申购金额[" + amount + "]");
+ moneylog.setAmountBefore(before);
+ moneylog.setAmount(totalAmount.negate());
+ moneylog.setAmountAfter(wallet.getMoney());
+ moneylog.setLog("新币购买，申购金额[" + amount + "]" + "手续费金额[" + fee + "]");
moneylog.setUserId(userId);
moneylog.setSymbol(ico.getSymbol());
moneylog.setWalletType(ico.getSymbol());
@@ -237,7 +260,7 @@
item.setTradeStatus("1");
item.setQuoteCurrency(ico.getCurrency());
item.setCurrencyType(1); //新币
- item.setStatus(0);
+ item.setStatus(1);
item.setTradeType(ico.getIsContractTrading().toString());
return item;
}
--
Gitblit v1.9.3