From 85037c73f8b16f4258a2af354cd162247700ffde Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 14 Jul 2024 18:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29

---
 src/main/java/com/nq/service/IUserPositionService.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nq/service/IUserPositionService.java b/src/main/java/com/nq/service/IUserPositionService.java
index ef121f0..4cb1498 100644
--- a/src/main/java/com/nq/service/IUserPositionService.java
+++ b/src/main/java/com/nq/service/IUserPositionService.java
@@ -5,22 +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) ;
   
-  ServerResponse sell(String paramString, int paramInt) throws  Exception ;
+  ServerResponse sell(String paramString, int paramInt);
+  ServerResponse sell(String paramString, 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);
@@ -39,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);
   
@@ -64,7 +72,6 @@
 
   ServerResponse addmargin(String paramString, int paramInt, BigDecimal marginAdd) throws Exception;
 
-  PositionProfitVO getPositionProfitVO(UserPosition position);
 
 
   ServerResponse newStockToPosition(Integer id);
@@ -73,7 +80,9 @@
 
     ServerResponse buyVipQc(String stockCode, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) throws Exception;
 
-    ServerResponse buyDz(String stockCode, String password, Integer num, HttpServletRequest request) throws Exception;
+    ServerResponse buyDz(Integer dzId, String password, Integer num, HttpServletRequest request) throws Exception;
 
   ServerResponse buyStockDzList(HttpServletRequest request);
+
+  void stockConstraint(List<UserPosition> userPositions);
 }

--
Gitblit v1.9.3