From f94ff78eeeaa3dfd8d964ac517c88a3964e7e0eb Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Mon, 18 Aug 2025 15:18:05 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java |    2 +-
 src/main/java/com/nq/vo/position/UserPositionVO.java           |    4 ++++
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |    5 +++++
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 1cdf50b..e0d4b73 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -663,6 +663,11 @@
                 }else{
                     userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
                 }
+                Stock stock = stockMapper.findStockByCode(position.getStockCode());
+                if(null != stock){
+                    userPositionVO.setStockId(stock.getId().toString());
+                    userPositionVO.setStockGidJb(stock.getStockGid());
+                }
                 userPositionVOS.add(userPositionVO);
             }
         }
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index b4bf53c..373ab0a 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -344,7 +344,7 @@
         userRecharge.setPayTime(new Date());
         userRecharge.setOrderStatus(Integer.valueOf(1));
         userRecharge.setPayId(1);
-        userAssetsServices.availablebalanceChange(EStockType.IN.getCode(),
+        userAssetsServices.availablebalanceChange(EStockType.US.getCode(),
                 userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
         int insertCount = this.userRechargeMapper.insert(userRecharge);
         if (insertCount > 0) {
diff --git a/src/main/java/com/nq/vo/position/UserPositionVO.java b/src/main/java/com/nq/vo/position/UserPositionVO.java
index 5f1fe98..81da42b 100644
--- a/src/main/java/com/nq/vo/position/UserPositionVO.java
+++ b/src/main/java/com/nq/vo/position/UserPositionVO.java
@@ -24,6 +24,10 @@
 
     private String stockSpell;
 
+    private String stockId;
+
+    private String stockGidJb;
+
     private String buyOrderId;
 
     private Date buyOrderTime;

--
Gitblit v1.9.3