From b25b5291764db80c79e24fd60c53d4b2d15640be Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 15 Aug 2025 16:18:02 +0800
Subject: [PATCH] 新股可重复购买
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index f3f21f4..5e909e2 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -126,11 +126,11 @@
}
// //重复申购限制
- Long count = userStockSubscribeMapper.selectCount(new QueryWrapper<UserStockSubscribe>().eq(
+ /*Long count = userStockSubscribeMapper.selectCount(new QueryWrapper<UserStockSubscribe>().eq(
"new_code", model.getNewCode()).eq("user_id", user.getId()).eq("type", model.getType()));
if (count > 0) {
return ServerResponse.createByErrorMsg("请勿重复申请",request);
- }
+ }*/
if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定",request);
}
@@ -144,10 +144,10 @@
}else{
bound = new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
}
- //如果不是默认货币需要转换金额
+ /*//如果不是默认货币需要转换金额
if (!stockSubscribe.getStockType().equals(EStockType.getDefault().getCode())) {
bound = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), bound);
- }
+ }*/
if(userAssets.getAvailableBalance().compareTo(bound) < 0){
return ServerResponse.createByErrorMsg("账户余额不足", request);
}
@@ -179,17 +179,17 @@
userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
}
userAssetsMapper.updateById(userAssets);
- //交易记录MEX
+ //交易记录
MoneyLog moneyLog = new MoneyLog();
EUserAssets eUserAssets = EUserAssets.BUY;
moneyLog.setDescs(eUserAssets.getDesc());
moneyLog.setBeFore(before);
moneyLog.setAfter(userAssets.getAvailableBalance().toString());
moneyLog.setAmount(bound.negate().toString());
- moneyLog.setAccectType(EStockType.getDefault().getCode());
+ moneyLog.setAccectType(stockSubscribe.getStockType());
moneyLog.setType(eUserAssets.getCode());
moneyLog.setUserId(user.getId()+"");
- moneyLog.setSymbol(EStockType.getDefault().getSymbol());
+ moneyLog.setSymbol(EStockType.getEStockTypeByCode(stockSubscribe.getStockType()).getSymbol());
moneyLog.setCreateTime(new Date());
moneyLogMapper.insert(moneyLog);
if (ret > 0) {
@@ -287,20 +287,20 @@
if(applyNumber > 0){
//需要退回的资金
refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
- //如果不是默认货币需要转换金额
+ /*//如果不是默认货币需要转换金额
if (!stockSubscribe.getStockType().equals(EStockType.getDefault().getCode())) {
refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
- }
+ }*/
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(refundPrice));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice));
}
}else{
if(applyNumber > 0){
refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
- //如果不是默认货币需要转换金额
+ /*//如果不是默认货币需要转换金额
if (!stockSubscribe.getStockType().equals(EStockType.getDefault().getCode())) {
refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
- }
+ }*/
BigDecimal subtract = refundPrice.subtract(userAssets.getAmountToBeCovered());
if(subtract.compareTo(BigDecimal.ZERO) <= 0){//如果退回的资金不足补足待补则直接减
userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(refundPrice));
@@ -319,10 +319,10 @@
moneyLog.setBeFore(before);
moneyLog.setAfter(userAssets.getAvailableBalance().toString());
moneyLog.setAmount(refundPrice.toString());
- moneyLog.setAccectType(EStockType.getDefault().getCode());
+ moneyLog.setAccectType(stockSubscribe.getStockType());
moneyLog.setType(eUserAssets.getCode());
moneyLog.setUserId(userAssets.getUserId()+"");
- moneyLog.setSymbol(EStockType.getDefault().getSymbol());
+ moneyLog.setSymbol(EStockType.getEStockTypeByCode(stockSubscribe.getStockType()).getSymbol());
moneyLog.setCreateTime(new Date());
moneyLogMapper.insert(moneyLog);
}
--
Gitblit v1.9.3