From ac28d010be3b35aeba3b695651e63a9963af7700 Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Thu, 3 Aug 2023 15:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=81=E4=BB=93=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=AD=A2=E6=8D=9F=E6=AD=A2=E7=9B=88=E5=90=8E=20?=
 =?UTF-8?q?=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=B9=B3=E4=BB=93=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MemberController.java          |  2 +-
 .../controller/TakeStashController.java       | 29 +++++++++++++++++++
 .../controller/TradingController.java         |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java
index 2487058..817d94a 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java
@@ -112,7 +112,7 @@ public class MemberController {
         member.setAvailableFunds(bigDecimalUtils.sub(netValue, marginUsed));  //设置可用资金
         //特殊处理 占用ReportScore 传递美元转换rmb
         ForexMarketData usdcnh = forexMarketDateUtil.getForexMarketDateByCode("USDCNY");
-        member.setReportScore(bigDecimalUtils.mul(Double.parseDouble(forexMarketDateUtil.getForexMarketDateByCode("USDCNY").getSellPic())*totalAssets,1,2));
+        member.setReportScore(bigDecimalUtils.mul(Double.parseDouble(usdcnh.getSellPic())*totalAssets,1,2));
 
         return new ResultEntity(HttpStatus.OK, "获取成员ID", member);
     }
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/TakeStashController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/TakeStashController.java
index a8d9b92..40583d8 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/controller/TakeStashController.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/TakeStashController.java
@@ -190,6 +190,7 @@ public class TakeStashController {
         ForexMarketData forexData = tradingController.getMarketQuotationByCode(tradingCode).getBody().getData();
         TakeStash takeStash = new TakeStash();
         takeStash.setStashId(stashId);
+        boolean flag=false;
         if (null != stopLoss || null != stopWin) {   //判断止损止赢是否合理 如果stopLoss stopWin都为null则跳过
             boolean winOrLossStopBoolean = tradingController.getWinOrLossStop(stopLoss, stopWin, buySellType, forexData);
             if (winOrLossStopBoolean == false) {
@@ -197,11 +198,39 @@ public class TakeStashController {
             }
             if (null != stopLoss) {
                 takeStash.setStopLoss(stopLoss);
+                flag=true;
             }
             if (null != stopWin) {
                 takeStash.setStopWin(stopWin);
+                flag=true;
             }
         }
+        TakeStash takeStashGet = takeStashService.selectByPrimaryKey(stashId);
+        if(flag==true){  //代表需要新增到redis中
+            redisUtil.del("*stashId_" + stashId + "*");
+            Set<String> keys = redisUtil.keys("*stashId_" + stashId + "*");
+            Map map=new HashMap();
+            if(stopLoss==null){
+                map.put("stopLoss",-1.0);
+            }else {
+                map.put("stopLoss",stopLoss);
+            }
+            if(stopWin==null){
+                map.put("stopWin",-1.0);
+            }else {
+                map.put("stopWin",stopWin);
+            }
+            map.put("stashId",stashId);
+            map.put("buySellType",buySellType);
+            map.put("tradingCode",tradingCode);
+            map.put("transactionVolume",takeStashGet.getVolumeTransaction());
+            map.put("priceTransaction",takeStashGet.getPriceTransaction());
+            map.put("memberId",takeStashGet.getMemberId());
+            map.put("trainingId",takeStashGet.getTrainingId());
+            redisUtil.hmset("trainingId_"+takeStashGet.getTrainingId()+"_stashId_"+stashId,map);
+        }else {
+            redisUtil.del("trainingId_"+takeStashGet.getTrainingId()+"_stashId_"+stashId);
+        }
         takeStashService.updateWinLossByPrimaryKey(takeStash);
         return new ResultEntity(HttpStatus.OK, "修改持仓成功");
     }
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/TradingController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/TradingController.java
index 336dc3c..e800525 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/controller/TradingController.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/TradingController.java
@@ -106,7 +106,7 @@ public class TradingController {
         String memberId = jsonObject.getString("memberId");
         String trainingId = jsonObject.getString("trainingId");
         if(trainingId==null){
-            trainingId="999999999";
+            trainingId=Constant.PRACTICE_TRAINING_ID;
         }
         Double priceCommission = jsonObject.getDouble("priceCommission"); //获取挂单开仓用户输入的价位
         ForexMarketData forexData = getMarketQuotationByCode(tradingCode).getBody().getData();//获取当前买卖价格