From 17da9871c1ecd5a1164f5a9269d13d33b489b6f7 Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Mon, 8 Jan 2024 16:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BF=9D=E8=AF=81=E9=87=91?=
 =?UTF-8?q?=E4=B8=BA=E8=B4=9F=E6=95=B0=E7=9A=84=E6=83=85=E5=86=B5=E5=92=8C?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E6=9C=AA=E9=87=8A=E6=94=BE=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forex/trading_trading/controller/TakeStashController.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 e4ac584..0625d0e 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
@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 
 @RestController
@@ -286,7 +287,7 @@ public class TakeStashController {
         marginUsed = bigDecimalUtils.mul(marginUsed-margin,1,2); //修改成员保证金
         //处理保证金为负数的情况和保证金未释放的情况
         List<TakeStash> takeStashList = takeStashService.selectAllByMemberIdAndStatus(memberId, 0);
-        if (takeStashList==null || takeStashList.size()==0){
+        if (takeStashList==null || takeStashList.size()==0 || takeStashList.size()==1){
             marginUsed=0.0;
         }
         if(marginUsed<0){