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 |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nq/service/IUserPositionService.java b/src/main/java/com/nq/service/IUserPositionService.java
index 1a4b1b5..89d4153 100644
--- a/src/main/java/com/nq/service/IUserPositionService.java
+++ b/src/main/java/com/nq/service/IUserPositionService.java
@@ -13,10 +13,10 @@
 
 public interface IUserPositionService {
   ServerResponse buy(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3,
-                     Integer paramInteger4,BigDecimal paramInteger5,BigDecimal paramInteger6, HttpServletRequest paramHttpServletRequest) ;
+                     Integer paramInteger4,BigDecimal paramInteger5,BigDecimal paramInteger6,HttpServletRequest paramHttpServletRequest,Integer userId) ;
   
   ServerResponse sell(String paramString, int paramInt);
-  ServerResponse sell(String paramString, int paramInt,  HttpServletRequest request);
+  ServerResponse sell(String paramString,Integer closeNumber, int paramInt,  HttpServletRequest request);
 
   ServerResponse allSell(HttpServletRequest request,String stockType)throws  Exception;
   
@@ -44,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);
   
@@ -80,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