From 31a7044804b7092fa262b6a9137cc95e8d740455 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 12 Mar 2025 16:25:41 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index f2b72db..acd9fbc 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -7,10 +7,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.nq.common.ServerResponse;
-import com.nq.dao.StockSubscribeMapper;
-import com.nq.dao.UserAssetsMapper;
-import com.nq.dao.UserMapper;
-import com.nq.dao.UserStockSubscribeMapper;
+import com.nq.dao.*;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
@@ -75,6 +72,9 @@
@Autowired
UserAssetsMapper userAssetsMapper;
+
+ @Resource
+ MoneyLogMapper moneyLogMapper;
/**
* 用户新股申购
* @param model
@@ -101,9 +101,9 @@
if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
}
- if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
- return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
- }
+// if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+// return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+// }
Date currentDate = new Date();
if(currentDate.before(stockSubscribe.getSubscriptionTime())){
return ServerResponse.createByErrorMsg("未开售",request);
@@ -233,6 +233,7 @@
if(null == userAssets){
return ServerResponse.createByErrorMsg("客户资金账户不存在");
}
+ String after = userAssets.getAvailableBalance().toString();
BigDecimal decimal = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(model.getApplyNumber()));//中签总价
BigDecimal availableBalance = userAssets.getAvailableBalance().subtract(decimal);//剩余可用余额
if(decimal.compareTo(userAssets.getAvailableBalance()) <= 0){
@@ -242,6 +243,17 @@
userAssets.setAvailableBalance(BigDecimal.ZERO);
userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(amountToBeCovered));
}
+ MoneyLog moneyLog = new MoneyLog();
+ moneyLog.setDescs("中签扣除");
+ moneyLog.setBeFore(userAssets.getAvailableBalance().toString());
+ moneyLog.setAfter(after);
+ moneyLog.setAmount(decimal.toString());
+ moneyLog.setAccectType("IN");
+ moneyLog.setType("中签扣除");
+ moneyLog.setUserId(userAssets.getUserId().toString());
+ moneyLog.setSymbol(EStockType.getEStockTypeByCode("IN").getSymbol());
+ moneyLog.setCreateTime(new Date());
+ moneyLogMapper.insert(moneyLog);
userAssetsMapper.updateById(userAssets);
ret = userStockSubscribeMapper.update1(model);
}else{
@@ -385,9 +397,9 @@
/*新股申购-查询列表*/
@Override
- public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
+ public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,String name,Integer status,HttpServletRequest request){
PageHelper.startPage(pageNum, pageSize);
- List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
+ List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId,name,status);
PageInfo pageInfo = new PageInfo(listData);
pageInfo.setList(listData);
return ServerResponse.createBySuccess(pageInfo);
--
Gitblit v1.9.3