From 61c3aaf5e641c53e358fdbf7f8b81b3ce27b7faa Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 25 Aug 2025 19:05:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 87 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 18a7f97..116f8ef 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -167,16 +167,16 @@
userStockSubscribe.setNewStockId(stockSubscribe.getNewlistId());
ret = userStockSubscribeMapper.insert(userStockSubscribe);
- BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
- if(subtract.compareTo(BigDecimal.ZERO) >= 0){
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(bound));
- userAssets.setAvailableBalance(subtract);
- }else{
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAvailableBalance()));
- userAssets.setAvailableBalance(BigDecimal.ZERO);
- userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
- }
- userAssetsMapper.updateById(userAssets);
+// BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
+// if(subtract.compareTo(BigDecimal.ZERO) >= 0){
+// userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(bound));
+// userAssets.setAvailableBalance(subtract);
+// }else{
+// userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAvailableBalance()));
+// userAssets.setAvailableBalance(BigDecimal.ZERO);
+// userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
+// }
+// userAssetsMapper.updateById(userAssets);
if (ret > 0) {
return ServerResponse.createBySuccessMsg("申购成功",request);
@@ -265,27 +265,42 @@
if(null == userAssets){
return ServerResponse.createByErrorMsg("客户资金账户不存在");
}
- int applyNumber = userStockSubscribe.getApplyNums() - model.getApplyNumber();
- if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) <= 0){
- if(applyNumber > 0){
- //需要退回的资金
- BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(refundPrice));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice));
- }
- }else{
- if(applyNumber > 0){
- BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
- BigDecimal subtract = refundPrice.subtract(userAssets.getAmountToBeCovered());
- if(subtract.compareTo(BigDecimal.ZERO) <= 0){//如果退回的资金不足补足待补则直接减
- userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(refundPrice));
- }else{//如果退回的资金足够填补待补资金还有剩余，则返回余额
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice).add(userAssets.getAmountToBeCovered()));
- userAssets.setAmountToBeCovered(BigDecimal.ZERO);
- userAssets.setAvailableBalance(subtract);
- }
- }
+
+ int applyNumber = model.getApplyNumber();//申购数量
+ BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));//总价
+ BigDecimal subtract = userAssets.getAvailableBalance().subtract(refundPrice);//减去申购总价，账户还剩多少钱
+
+ if(subtract.compareTo(BigDecimal.ZERO) >= 0){//如果账户资金充足，直接添加冻结，修改账户余额
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(refundPrice));
+ userAssets.setAvailableBalance(subtract);
+ }else{//如果资金不够，冻结加上账户所有余额，账户余额归零，待补资金加上需要补齐多少钱
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAvailableBalance()));
+ userAssets.setAvailableBalance(BigDecimal.ZERO);
+ userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
}
+ userAssetsMapper.updateById(userAssets);
+
+// int applyNumber = userStockSubscribe.getApplyNums() - model.getApplyNumber();
+// if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) <= 0){
+// if(applyNumber > 0){
+// //需要退回的资金
+// BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+// userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(refundPrice));
+// userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice));
+// }
+// }else{
+// if(applyNumber > 0){
+// BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+// BigDecimal subtract = refundPrice.subtract(userAssets.getAmountToBeCovered());
+// if(subtract.compareTo(BigDecimal.ZERO) <= 0){//如果退回的资金不足补足待补则直接减
+// userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(refundPrice));
+// }else{//如果退回的资金足够填补待补资金还有剩余，则返回余额
+// userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice).add(userAssets.getAmountToBeCovered()));
+// userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+// userAssets.setAvailableBalance(subtract);
+// }
+// }
+// }
ret = userStockSubscribeMapper.update1(model);
userAssetsMapper.updateById(userAssets);
iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
@@ -304,12 +319,12 @@
ret = userStockSubscribeMapper.update1(model);
}
}else if (model.getStatus() == 2){
- BigDecimal bond = (stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNums()));
- BigDecimal subtractMoney = bond.subtract(userAssets.getAmountToBeCovered());//需要退回的钱
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtractMoney.abs()));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(subtractMoney));
- userAssets.setAmountToBeCovered(BigDecimal.ZERO);
- userAssetsMapper.updateById(userAssets);
+// BigDecimal bond = (stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNums()));
+// BigDecimal subtractMoney = bond.subtract(userAssets.getAmountToBeCovered());//需要退回的钱
+// userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtractMoney.abs()));
+// userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(subtractMoney));
+// userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+// userAssetsMapper.updateById(userAssets);
ret = userStockSubscribeMapper.update1(model);
}else if (model.getStatus() == 5){
return iUserPositionService.newStockToPosition(model.getId(),BigDecimal.ZERO);
--
Gitblit v1.9.3