From ec72fc1827d3e46a99d302dd3c9ca61411c70943 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 24 Jul 2025 14:41:25 +0800
Subject: [PATCH] 修改

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

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 1cb8054..3192693 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -281,10 +281,12 @@
                             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){
                                 //需要退回的资金
-                                BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+                                refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
                                 //如果不是墨西哥币需要转换金额
                                 if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
                                     refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
@@ -294,7 +296,7 @@
                             }
                         }else{
                             if(applyNumber > 0){
-                                BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
+                                refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
                                 //如果不是墨西哥币需要转换金额
                                 if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
                                     refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
@@ -309,6 +311,21 @@
                                 }
                             }
                         }
+                        //如果退回资金 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(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());//转持仓

--
Gitblit v1.9.3