From 87a73c3b49c9203ab3c797c575b9c2b9dea10e7a Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 18 Sep 2025 17:16:20 +0800
Subject: [PATCH] 印度时区
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 195 ++++++++++++++++++++++++++++++------------------
1 files changed, 120 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index dacba97..a59282d 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -105,6 +105,15 @@
// 申请数量为空时返回错误信息
return ServerResponse.createByErrorMsg("申请数量不能为空", request);
}
+
+ //用户是否杠杆
+ boolean isLever = model.getLever() != null && model.getLever().intValue() > 0;
+ if (isLever) {
+ model.setApplyNums(model.getApplyNums() * model.getLever().intValue());
+ } else {
+ model.setApplyNums(model.getApplyNums() * stockSubscribe.getLever().intValue());
+ }
+
if(model.getApplyNums() < stockSubscribe.getMinNumber() ){
return ServerResponse.createByErrorMsg("最少申购：" + stockSubscribe.getMinNumber(), request);
}
@@ -126,16 +135,14 @@
}
// //重复申购限制
- 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);
}
-
- model.setApplyNums((int) (model.getApplyNums()*stockSubscribe.getLever()));
//计算申购金额
BigDecimal bound;
@@ -144,15 +151,24 @@
}else{
bound = new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
}
- //如果不是墨西哥币需要转换金额
- if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
+ /*//如果不是默认货币需要转换金额
+ if (!stockSubscribe.getStockType().equals(EStockType.getDefault().getCode())) {
bound = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), bound);
+ }*/
+
+ //需要资金
+ /*BigDecimal needBound;
+ //杠杆账户只需初始数量资金
+ if (isLever) {
+ needBound = bound.divide(new BigDecimal(model.getLever()));
+ } else {
+ needBound = bound;
}
- if(userAssets.getAvailableBalance().compareTo(bound) < 0){
+ if(userAssets.getAvailableBalance().compareTo(needBound) < 0){
return ServerResponse.createByErrorMsg("账户余额不足", request);
}
+ String before = userAssets.getAvailableBalance().toString();*/
- String before = userAssets.getAvailableBalance().toString();
if(stockSubscribe.getType() == 1){
model.setUserId(user.getId());
model.setNewName(stockSubscribe.getName());
@@ -169,7 +185,7 @@
userStockSubscribe.setNewStockId(stockSubscribe.getNewlistId());
ret = userStockSubscribeMapper.insert(userStockSubscribe);
- BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
+ /*BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
if(subtract.compareTo(BigDecimal.ZERO) >= 0){
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(bound));
userAssets.setAvailableBalance(subtract);
@@ -179,19 +195,19 @@
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.MX.getCode());
+ moneyLog.setAccectType(stockSubscribe.getStockType());
moneyLog.setType(eUserAssets.getCode());
moneyLog.setUserId(user.getId()+"");
- moneyLog.setSymbol(EStockType.MX.getSymbol());
+ moneyLog.setSymbol(EStockType.getEStockTypeByCode(stockSubscribe.getStockType()).getSymbol());
moneyLog.setCreateTime(new Date());
- moneyLogMapper.insert(moneyLog);
+ moneyLogMapper.insert(moneyLog);*/
if (ret > 0) {
return ServerResponse.createBySuccessMsg("申购成功",request);
} else {
@@ -200,13 +216,13 @@
}else{
// BigDecimal bound;
-// if(stockSubscribe.getMinPrice() != null || stockSubscribe.getMinPrice().compareTo(BigDecimal.ZERO)<0){
+// if(stockSubscribe.getMinPrice() != null && stockSubscribe.getMinPrice().compareTo(BigDecimal.ZERO) > 0) {
// bound = new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getMinPrice());
// }else{
// bound = new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
// }
//
- BigDecimal useEnaAmount = iUserAssetsServices.getAvailableBalance(EStockType.US.getCode(), user.getId());
+ BigDecimal useEnaAmount = iUserAssetsServices.getAvailableBalance(stockSubscribe.getStockType(), user.getId());
if(useEnaAmount.compareTo(bound)<0){
return ServerResponse.createByErrorMsg("余额不足,配售失败",request);
}
@@ -274,60 +290,88 @@
UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), userStockSubscribe.getUserId());
if (model.getStatus() == 3 && model.getApplyNumber() != null){
if(stockSubscribe.getType() == 1){
- model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
+ BigDecimal bound;
+ if(stockSubscribe.getMinPrice() != null && stockSubscribe.getMinPrice().compareTo(BigDecimal.ZERO) > 0) {
+ bound = new BigDecimal(model.getApplyNumber()).multiply(stockSubscribe.getMinPrice());
+ }else{
+ bound = new BigDecimal(model.getApplyNumber()).multiply(stockSubscribe.getPrice());
+ }
+ model.setBond(bound);
model.setDbMoney(model.getDbMoney());
if(null == userAssets){
return ServerResponse.createByErrorMsg("客户资金账户不存在");
}
- int applyNumber = userStockSubscribe.getApplyNums() - model.getApplyNumber();
- BigDecimal refundPrice = BigDecimal.ZERO;
String before = userAssets.getAvailableBalance().toString();
- if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) <= 0){
- if(applyNumber > 0){
- //需要退回的资金
- refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
- //如果不是墨西哥币需要转换金额
- if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
- refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
- }
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(refundPrice));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice));
- }
+ BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
+ if(subtract.compareTo(BigDecimal.ZERO) >= 0){
+ userAssets.setAvailableBalance(subtract);
}else{
- if(applyNumber > 0){
- refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
- //如果不是墨西哥币需要转换金额
- if (!stockSubscribe.getStockType().equals(EStockType.MX.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));
- }else{//如果退回的资金足够填补待补资金还有剩余，则返回余额
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice).add(userAssets.getAmountToBeCovered()));
- userAssets.setAmountToBeCovered(BigDecimal.ZERO);
- userAssets.setAvailableBalance(subtract);
- }
- }
+ userAssets.setAvailableBalance(BigDecimal.ZERO);
+ userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(subtract.abs()));
}
- //退回资金 交易记录MEX
+ //交易记录
MoneyLog moneyLog = new MoneyLog();
- EUserAssets eUserAssets = EUserAssets.BUY_RT;
+ EUserAssets eUserAssets = EUserAssets.BUY;
moneyLog.setDescs(eUserAssets.getDesc());
moneyLog.setBeFore(before);
moneyLog.setAfter(userAssets.getAvailableBalance().toString());
- moneyLog.setAmount(refundPrice.toString());
- moneyLog.setAccectType(EStockType.MX.getCode());
+ moneyLog.setAmount(bound.negate().toString());
+ moneyLog.setAccectType(stockSubscribe.getStockType());
moneyLog.setType(eUserAssets.getCode());
- moneyLog.setUserId(userAssets.getUserId()+"");
- moneyLog.setSymbol(EStockType.MX.getSymbol());
+ moneyLog.setUserId(userStockSubscribe.getUserId()+"");
+ moneyLog.setSymbol(EStockType.getEStockTypeByCode(stockSubscribe.getStockType()).getSymbol());
moneyLog.setCreateTime(new Date());
moneyLogMapper.insert(moneyLog);
+
+// BigDecimal refundPrice = BigDecimal.ZERO;
+// if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) <= 0){
+// 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));
+// }else{//如果退回的资金足够填补待补资金还有剩余，则返回余额
+// userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(refundPrice).add(userAssets.getAmountToBeCovered()));
+// userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+// userAssets.setAvailableBalance(subtract);
+// }
+// }
+// }
+// //如果退回资金 add交易记录MEX
+// if (refundPrice.compareTo(BigDecimal.ZERO) > 0) {
+// MoneyLog moneyLog = new MoneyLog();
+// EUserAssets eUserAssets = EUserAssets.BUY_RT;
+// moneyLog.setDescs(eUserAssets.getDesc());
+// moneyLog.setBeFore(before);
+// moneyLog.setAfter(userAssets.getAvailableBalance().toString());
+// moneyLog.setAmount(refundPrice.toString());
+// moneyLog.setAccectType(stockSubscribe.getStockType());
+// moneyLog.setType(eUserAssets.getCode());
+// moneyLog.setUserId(userAssets.getUserId()+"");
+// moneyLog.setSymbol(EStockType.getEStockTypeByCode(stockSubscribe.getStockType()).getSymbol());
+// moneyLog.setCreateTime(new Date());
+// moneyLogMapper.insert(moneyLog);
+// }
ret = userStockSubscribeMapper.update1(model);
userAssetsMapper.updateById(userAssets);
- iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
- model.setStatus(5);
+ //iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
+ //model.setStatus(5);
}else{
if(model.getApplyNumber()>model.getApplyNums()){
return ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
@@ -342,16 +386,17 @@
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);
+ if(stockSubscribe.getType() == 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);
+ }
ret = userStockSubscribeMapper.update1(model);
}else if (model.getStatus() == 5){
return iUserPositionService.newStockToPosition(model.getId(),BigDecimal.ZERO);
-
}
if(ret>0 && model.getStatus() == 3 ){
//给用户推送消息
@@ -497,26 +542,26 @@
String header = request.getHeader(property);
if (header != null) {
User user = iUserService.getCurrentRefreshUser(request);
-
List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
- /*if (type==null||type.equals("")){
- userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
- }else{
- userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).eq("type", type).orderByDesc("add_time"));
- }*/
-
- List<UserStockSubscribeVo> list = new ArrayList<>();
- for (UserStockSubscribeVo userStockSubscribe1 : userStockSubscribe) {
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
- .eq("newlist_id", userStockSubscribe1.getNewStockId()));
- if (stockSubscribe != null) {
- list.add(userStockSubscribe1);
- }
- }
- return ServerResponse.createBySuccess(list);
+ return ServerResponse.createBySuccess(userStockSubscribe);
}
return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
}
+
+ @Override
+ public ServerResponse getOneSubscribeByUserIdPage(int pageNum,int pageSize,String type, Integer status, HttpServletRequest request) {
+ String property = PropertiesUtil.getProperty("user.cookie.name");
+ String header = request.getHeader(property);
+ if (header != null) {
+ User user = iUserService.getCurrentRefreshUser(request);
+ PageHelper.startPage(pageNum, pageSize);
+ List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
+ PageInfo<UserStockSubscribeVo> pageInfo = new PageInfo<>(userStockSubscribe);
+ return ServerResponse.createBySuccess(pageInfo);
+ }
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ }
+
/**
* 新股申购-用户提交金额
*/
--
Gitblit v1.9.3