From 6404cb07e5281cfd901267c4fd560ba89bd5e2fd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 16:49:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ysz' into ysz
---
src/main/java/com/nq/service/IUserPositionService.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/service/IUserPositionService.java b/src/main/java/com/nq/service/IUserPositionService.java
index 6ef89f5..89d4153 100644
--- a/src/main/java/com/nq/service/IUserPositionService.java
+++ b/src/main/java/com/nq/service/IUserPositionService.java
@@ -5,20 +5,27 @@
import com.nq.pojo.UserPosition;
import com.nq.vo.position.PositionProfitVO;
import com.nq.vo.position.PositionVO;
+import com.nq.vo.position.UserPositionVO;
import java.math.BigDecimal;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
public interface IUserPositionService {
- ServerResponse buy(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3, Integer paramInteger4,BigDecimal paramInteger5,BigDecimal paramInteger6, HttpServletRequest paramHttpServletRequest) throws Exception;
+ ServerResponse buy(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3,
+ Integer paramInteger4,BigDecimal paramInteger5,BigDecimal paramInteger6,HttpServletRequest paramHttpServletRequest,Integer userId) ;
- ServerResponse sell(String paramString, int paramInt) throws Exception;
+ ServerResponse sell(String paramString, int paramInt);
+ ServerResponse sell(String paramString,Integer closeNumber, int paramInt, HttpServletRequest request);
+
+ ServerResponse allSell(HttpServletRequest request,String stockType)throws Exception;
ServerResponse lock(Integer paramInteger1, Integer paramInteger2, String paramString);
ServerResponse del(Integer paramInteger);
-
+
+
+ UserPositionVO findByPostionSn(String positionSn);
ServerResponse<PageInfo> findMyPositionByCodeAndSpell(String paramString1, String paramString2, Integer paramInteger,
HttpServletRequest paramHttpServletRequest,
int paramInt1, int paramInt2,String stockType);
@@ -37,7 +44,10 @@
ServerResponse getIncome(Integer paramInteger1, Integer paramInteger2, String paramString1, String paramString2);
- ServerResponse listByAdmin(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3, Integer paramInteger4, String paramString1, String paramString2, String paramString3, int paramInt1, int paramInt2);
+ ServerResponse listByAdmin(Integer paramInteger1,
+ Integer paramInteger2, Integer paramInteger3,
+ Integer paramInteger4, String paramString1, String paramString2, String paramString3,
+ int paramInt1, int paramInt2,String phone);
int CountPositionNum(Integer paramInteger1, Integer paramInteger2);
@@ -62,7 +72,6 @@
ServerResponse addmargin(String paramString, int paramInt, BigDecimal marginAdd) throws Exception;
- PositionProfitVO getPositionProfitVO(UserPosition position);
ServerResponse newStockToPosition(Integer id);
@@ -74,4 +83,8 @@
ServerResponse buyDz(String stockCode, String password, Integer num, HttpServletRequest request) throws Exception;
ServerResponse buyStockDzList(HttpServletRequest request);
+
+ void stockConstraint(List<UserPosition> userPositions);
+
+ Integer checkStockVip(Integer stockId,Integer buyNum,Integer buyType,Integer lever,BigDecimal profitTarget,BigDecimal stopLoss, HttpServletRequest request);
}
--
Gitblit v1.9.3