From 031ea962cfd1790726e96620cad65209315f27c7 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 22 Jul 2025 15:53:34 +0800
Subject: [PATCH] 新增购买退回明细

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |  299 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 163 insertions(+), 136 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index ee62972..dacba97 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -5,13 +5,9 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.nq.Repository.ExchangeRateRepository;
 import com.nq.common.ResponseCode;
 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.*;
@@ -60,10 +56,6 @@
     ISiteProductService iSiteProductService;
     @Autowired
     IUserService iUserService;
-    @Autowired
-    ISiteSettingService iSiteSettingService;
-    @Autowired
-    TradingHourServiceImpl tradingHourService;
 
     @Resource
     IUserAssetsServices iUserAssetsServices;
@@ -72,7 +64,7 @@
     UserAssetsMapper userAssetsMapper;
 
     @Autowired
-    ExchangeRateRepository exchangeRateRepository;
+    MoneyLogMapper moneyLogMapper;
 
     /**
      * 用户新股申购
@@ -92,6 +84,9 @@
             if (model.getNewCode() != null) {
                 StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>()
                         .eq("newlist_id", model.getNewlistId()));
+                if (stockSubscribe == null) {
+                    return ServerResponse.createByErrorMsg("新的股票代码不存在",request);
+                }
                 //判断购买新股需不需要密钥
                 if(StringUtils.isNotEmpty(stockSubscribe.getPassword()) && !stockSubscribe.getPassword().equals(model.getPassword())){
                     return ServerResponse.createByErrorMsg("密钥输入错误",request);
@@ -117,10 +112,10 @@
                     return ServerResponse.createByErrorMsg("最多可申购:" + stockSubscribe.getOrderNumber(), request);
                 }
 
-                BigDecimal sumPrice = stockSubscribe.getPrice().multiply(new BigDecimal(model.getApplyNums()));
+                /*BigDecimal sumPrice = stockSubscribe.getPrice().multiply(new BigDecimal(model.getApplyNums()));
                 if(userAssets.getAvailableBalance().compareTo(sumPrice) < 0){
                     return ServerResponse.createByErrorMsg("账户余额不足", request);
-                }
+                }*/
 
                 Date currentDate = new Date();
                 if(currentDate.before(stockSubscribe.getSubscriptionTime())){
@@ -139,9 +134,6 @@
                 if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
                     return ServerResponse.createByErrorMsg("订单失败,帐户已被锁定",request);
                 }
-                if (stockSubscribe == null) {
-                    return ServerResponse.createByErrorMsg("新的股票代码不存在",request);
-                }
 
                 model.setApplyNums((int) (model.getApplyNums()*stockSubscribe.getLever()));
 
@@ -152,6 +144,15 @@
                 }else{
                     bound =  new BigDecimal(model.getApplyNums()).multiply(stockSubscribe.getPrice());
                 }
+                //如果不是墨西哥币需要转换金额
+                if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
+                    bound = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), bound);
+                }
+                if(userAssets.getAvailableBalance().compareTo(bound) < 0){
+                    return ServerResponse.createByErrorMsg("账户余额不足", request);
+                }
+
+                String before = userAssets.getAvailableBalance().toString();
                 if(stockSubscribe.getType() == 1){
                     model.setUserId(user.getId());
                     model.setNewName(stockSubscribe.getName());
@@ -168,10 +169,6 @@
                     userStockSubscribe.setNewStockId(stockSubscribe.getNewlistId());
                     ret = userStockSubscribeMapper.insert(userStockSubscribe);
 
-                    //如果不是墨西哥币需要转换金额
-                    if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
-                        bound = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), bound);
-                    }
                     BigDecimal subtract = userAssets.getAvailableBalance().subtract(bound);
                     if(subtract.compareTo(BigDecimal.ZERO) >= 0){
                         userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(bound));
@@ -182,7 +179,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.setType(eUserAssets.getCode());
+                    moneyLog.setUserId(user.getId()+"");
+                    moneyLog.setSymbol(EStockType.MX.getSymbol());
+                    moneyLog.setCreateTime(new Date());
+                    moneyLogMapper.insert(moneyLog);
                     if (ret > 0) {
                         return ServerResponse.createBySuccessMsg("申购成功",request);
                     } else {
@@ -238,96 +247,112 @@
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request) throws Exception {
-        int ret = 0;
-        if( model.getId() != null  ){
-            if (model.getStatus() == 3||model.getStatus() == 2) {
-                model.setEndTime(DateTimeUtil.getCurrentDate());
-            }
-            UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(model.getId());
-            if (userStockSubscribe.getStatus() == 5) {
-                return ServerResponse.createByErrorMsg("It's been converted");
-            }
-            if(userStockSubscribe.getStatus() == 3){
-                return ServerResponse.createByErrorMsg("不能更改申购状态");
-            }
-            StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
-                    .eq("newlist_id", userStockSubscribe.getNewStockId()));
-            if((model.getStatus() == 3 && model.getApplyNumber() == null) || (model.getStatus() == 3 && model.getApplyNumber() == 0) ){
-                return ServerResponse.createByErrorMsg("中签数量不能小于0");
-            }
-            if(model.getStatus() == 3 && model.getApplyNumber()>userStockSubscribe.getApplyNums()){
-                return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
-            }
-
-            //客户中签直接扣除客户账户可用资金
-            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())));
-                    model.setDbMoney(model.getDbMoney());
-
-                    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));
-                            //如果不是墨西哥币需要转换金额
-                            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));
-                        }
-                    }else{
-                        if(applyNumber > 0){
-                            BigDecimal 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);
-                            }
-                        }
-                    }
-                    ret = userStockSubscribeMapper.update1(model);
-                    userAssetsMapper.updateById(userAssets);
-                    iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
-                    model.setStatus(5);
-                }else{
-                    if(model.getApplyNumber()>model.getApplyNums()){
-                        return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
-                    }
-                    BigDecimal cCount = new BigDecimal(model.getApplyNums()-model.getApplyNumber());
-                    BigDecimal tMoney = ((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
-                    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);
-                    model.setStatus(4);
-                    ret = userStockSubscribeMapper.update1(model);
+    public ServerResponse save(UserStockSubscribe model, HttpServletRequest request){
+        try {
+            int ret = 0;
+            if( model.getId() != null){
+                if (model.getStatus() == 3||model.getStatus() == 2) {
+                    model.setEndTime(DateTimeUtil.getCurrentDate());
                 }
-            }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);
-                ret = userStockSubscribeMapper.update1(model);
-            }else if (model.getStatus() == 5){
+                UserStockSubscribe userStockSubscribe = userStockSubscribeMapper.load(model.getId());
+                if (userStockSubscribe.getStatus() == 5) {
+                    return ServerResponse.createByErrorMsg("It's been converted");
+                }
+                if(userStockSubscribe.getStatus() == 3){
+                    return ServerResponse.createByErrorMsg("不能更改申购状态");
+                }
+                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
+                        .eq("newlist_id", userStockSubscribe.getNewStockId()));
+                if((model.getStatus() == 3 && model.getApplyNumber() == null) || (model.getStatus() == 3 && model.getApplyNumber() == 0) ){
+                    return ServerResponse.createByErrorMsg("中签数量不能小于0");
+                }
+                if(model.getStatus() == 3 && model.getApplyNumber()>userStockSubscribe.getApplyNums()){
+                    return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
+                }
+
+                //客户中签直接扣除客户账户可用资金
+                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())));
+                        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));
+                            }
+                        }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);
+                                }
+                            }
+                        }
+                        //退回资金 交易记录MEX
+                        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(EStockType.MX.getCode());
+                        moneyLog.setType(eUserAssets.getCode());
+                        moneyLog.setUserId(userAssets.getUserId()+"");
+                        moneyLog.setSymbol(EStockType.MX.getSymbol());
+                        moneyLog.setCreateTime(new Date());
+                        moneyLogMapper.insert(moneyLog);
+                        ret = userStockSubscribeMapper.update1(model);
+                        userAssetsMapper.updateById(userAssets);
+                        iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
+                        model.setStatus(5);
+                    }else{
+                        if(model.getApplyNumber()>model.getApplyNums()){
+                            return  ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
+                        }
+                        BigDecimal cCount = new BigDecimal(model.getApplyNums()-model.getApplyNumber());
+                        BigDecimal tMoney = ((stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice())).multiply(cCount);
+                        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);
+                        model.setStatus(4);
+                        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);
+                    ret = userStockSubscribeMapper.update1(model);
+                }else if (model.getStatus() == 5){
                     return iUserPositionService.newStockToPosition(model.getId(),BigDecimal.ZERO);
 
-            }
+                }
                 if(ret>0 && model.getStatus() == 3 ){
                     //给用户推送消息
                     SiteMessage siteMessage = new SiteMessage();
@@ -371,39 +396,41 @@
                     }
 
                 }
-        } else{
-            if(model.getPhone() != null&&model.getId()==null) {
-                User user = userMapper.findByPhone(model.getPhone());
-                if (user == null) {
-                    return ServerResponse.createByErrorMsg("User does not exist");
-                }
-                model.setRealName(user.getRealName());
-                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()));
-                if (stockSubscribe == null) {
-                    return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
-                }
+            } else{
+                if(model.getPhone() != null&&model.getId()==null) {
+                    User user = userMapper.findByPhone(model.getPhone());
+                    if (user == null) {
+                        return ServerResponse.createByErrorMsg("User does not exist");
+                    }
+                    model.setRealName(user.getRealName());
+                    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()));
+                    if (stockSubscribe == null) {
+                        return ServerResponse.createByErrorMsg("Failed. Ipo information does not exist");
+                    }
 
-                model.setNewName(stockSubscribe.getName());
-                model.setBuyPrice(stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice());
-                if (model.getApplyNums() > stockSubscribe.getOrderNumber() || model.getApplyNumber() > stockSubscribe.getOrderNumber()) {
-                    return ServerResponse.createByErrorMsg("The number of applications or the number of wins is the maximum" + stockSubscribe.getOrderNumber());
+                    model.setNewName(stockSubscribe.getName());
+                    model.setBuyPrice(stockSubscribe.getMinPrice() != null ? stockSubscribe.getMinPrice() : stockSubscribe.getPrice());
+                    if (model.getApplyNums() > stockSubscribe.getOrderNumber() || model.getApplyNumber() > stockSubscribe.getOrderNumber()) {
+                        return ServerResponse.createByErrorMsg("The number of applications or the number of wins is the maximum" + stockSubscribe.getOrderNumber());
+                    }
+                    model.setBond(model.getBuyPrice().multiply(BigDecimal.valueOf(model.getApplyNumber())));
+                    model.setAddTime(DateTimeUtil.getCurrentDate());
+                    model.setOrderNo(KeyUtils.getUniqueKey());
+                    model.setType(stockSubscribe.getType());
+                    UserStockSubscribeAddIn convert = Convert.convert(UserStockSubscribeAddIn.class, model);
+                    return insert(convert,request);
                 }
-                model.setBond(model.getBuyPrice().multiply(BigDecimal.valueOf(model.getApplyNumber())));
-                model.setAddTime(DateTimeUtil.getCurrentDate());
-                model.setOrderNo(KeyUtils.getUniqueKey());
-                model.setType(stockSubscribe.getType());
-                UserStockSubscribeAddIn convert = Convert.convert(UserStockSubscribeAddIn.class, model);
-                return insert(convert,request);
             }
+            if(ret>0){
+                return ServerResponse.createBySuccessMsg("Successful operation");
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
         }
-        if(ret>0){
-            return ServerResponse.createBySuccessMsg("Successful operation");
-        }
-
         return ServerResponse.createByErrorMsg("Operation failure");
     }
     /**

--
Gitblit v1.9.3