From f37052eabfc9243e2004e7f2d0495f3b838225ad Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 11 Oct 2024 18:33:06 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 9d8ae2e..00e66b4 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -2,18 +2,17 @@
 
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.*;
 import com.nq.service.*;
+import com.nq.utils.redis.CookieUtils;
 import com.nq.utils.timeutil.DateTimeUtil;
 import com.nq.utils.KeyUtils;
 import com.nq.utils.PropertiesUtil;
@@ -73,6 +72,9 @@
 
     @Autowired
     UserAssetsMapper userAssetsMapper;
+
+    @Resource
+    MoneyLogMapper moneyLogMapper;
     /**
      * 用户新股申购
      * @param model
@@ -231,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){
@@ -240,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{
@@ -316,8 +330,7 @@
                 model.setUserId(user.getId());
                 model.setAgentId(user.getAgentId());
                 model.setAgentName(user.getAgentName());
-                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
-                        .eq("newlist_id", model.getNewStockId()));
+                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<>(StockSubscribe.class).eq(StockSubscribe::getCode,model.getNewCode()));
                 if (stockSubscribe == null) {
                     return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
                 }
@@ -384,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