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 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){