From c8b031a405ebd2b450f5098bb37e5e63390f364c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 18 Jul 2025 09:57:31 +0800
Subject: [PATCH] 新增贷款，优化
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 84 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 3f4fe1e..3faf5d6 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.nq.common.ResponseCode;
import com.nq.common.ServerResponse;
import com.nq.dao.StockSubscribeMapper;
import com.nq.dao.UserAssetsMapper;
@@ -75,7 +76,7 @@
* @return
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse insert(UserStockSubscribeAddIn model, HttpServletRequest request) throws Exception {
int ret = 0;
if (model == null) {
@@ -208,7 +209,7 @@
UserStockSubscribe userStockSubscribe = Convert.convert(UserStockSubscribe.class, model);
userStockSubscribe.setNewStockId(stockSubscribe.getNewlistId());
ret = userStockSubscribeMapper.insert(userStockSubscribe);
- iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
+ iUserAssetsServices.availablebalanceChange(stockSubscribe.getStockType(), user.getId(),EUserAssets.BUY,bound.negate(),"","");
if (ret > 0) {
return ServerResponse.createBySuccessMsg("配售成功",request);
} else {
@@ -229,7 +230,7 @@
* admin 新股申购-添加和修改
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) throws Exception {
int ret = 0;
if( model.getId() != null ){
@@ -293,7 +294,7 @@
}
BigDecimal cCount = new BigDecimal(model.getApplyNums()-model.getApplyNumber());
BigDecimal tMoney = ((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
- iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(),userStockSubscribe.getUserId(),
+ iUserAssetsServices.availablebalanceChange(stockSubscribe.getStockType(),userStockSubscribe.getUserId(),
EUserAssets.TOP_UP,tMoney,"","");
model.setBond((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice()).multiply(BigDecimal.valueOf(model.getApplyNumber())));
model.setDbMoney(BigDecimal.ZERO);
@@ -472,51 +473,60 @@
}
return ServerResponse.createBySuccess(list);
}
- return ServerResponse.createByErrorCodeMsg(401,"请先登录");
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
}
/**
* 新股申购-用户提交金额
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse userSubmit(Integer id,HttpServletRequest request) {
- int ret = 0;
- String property = PropertiesUtil.getProperty("user.cookie.name");
- String header = request.getHeader(property);
- if (header != null) {
- User user = iUserService.getCurrentRefreshUser(request);
- if(id == null){
- return ServerResponse.createByErrorMsg("参数错误",request);
- }
- UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
- if (userStockSubscribe != null && userStockSubscribe.getUserId().equals(user.getId())) {
- if(userStockSubscribe.getType()== 2 ){
- return ServerResponse.createByErrorMsg("未中签,无需支付",request);
+ try {
+ int ret = 0;
+ String property = PropertiesUtil.getProperty("user.cookie.name");
+ String header = request.getHeader(property);
+ if (header != null) {
+ User user = iUserService.getCurrentRefreshUser(request);
+ if(id == null){
+ return ServerResponse.createByErrorMsg("参数错误",request);
}
- if (userStockSubscribe.getStatus() == 3) {
- userStockSubscribe.setSubmitTime(DateTimeUtil.getCurrentDate());
- userStockSubscribe.setStatus(4);
- BigDecimal bigDecimal = iUserAssetsServices.
- getAvailableBalance(EStockType.US.getCode(),
- userStockSubscribe.getUserId());
-
- BigDecimal multiply = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(userStockSubscribe.getApplyNumber()));
- if(bigDecimal.compareTo(multiply) <= 0){
- return ServerResponse.createByErrorMsg("余额不足",request);
+ UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(id);
+ if (userStockSubscribe != null && userStockSubscribe.getUserId().equals(user.getId())) {
+ if(userStockSubscribe.getType()== 2 ){
+ return ServerResponse.createByErrorMsg("未中签,无需支付",request);
}
- iUserAssetsServices.availablebalanceChange(EStockType.US.getCode(),userStockSubscribe.getUserId(),
- EUserAssets.BUY,multiply.negate(),"","");
- userStockSubscribe.setDbMoney(BigDecimal.ZERO);
- userStockSubscribeMapper.update1(userStockSubscribe);
- return ServerResponse.createBySuccess();
+ if (userStockSubscribe.getStatus() == 3) {
+ StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+ .eq("newlist_id", userStockSubscribe.getNewStockId()));
+ if (stockSubscribe == null) {
+ return ServerResponse.createByErrorMsg("新股不存在",request);
+ }
+ userStockSubscribe.setSubmitTime(DateTimeUtil.getCurrentDate());
+ userStockSubscribe.setStatus(4);
+ BigDecimal bigDecimal = iUserAssetsServices.
+ getAvailableBalance(EStockType.US.getCode(),
+ userStockSubscribe.getUserId());
+
+ BigDecimal multiply = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(userStockSubscribe.getApplyNumber()));
+ if(bigDecimal.compareTo(multiply) <= 0){
+ return ServerResponse.createByErrorMsg("余额不足",request);
+ }
+ iUserAssetsServices.availablebalanceChange(stockSubscribe.getStockType(), userStockSubscribe.getUserId(),
+ EUserAssets.BUY,multiply.negate(),"","");
+ userStockSubscribe.setDbMoney(BigDecimal.ZERO);
+ userStockSubscribeMapper.update1(userStockSubscribe);
+ return ServerResponse.createBySuccess();
+ } else {
+ return ServerResponse.createByErrorMsg("不成功的申请者不收取任何费用",request);
+ }
} else {
- return ServerResponse.createByErrorMsg("不成功的申请者不收取任何费用",request);
+ return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
}
- } else {
- return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
}
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ } catch (Exception e) {
+ return ServerResponse.createByErrorMsg(e.getMessage());
}
- return ServerResponse.createByErrorCodeMsg(401,"请先登录");
}
/**
* 新股申购-删除
--
Gitblit v1.9.3