From c8fba69fa3c55036e45c177a744674dd1b0df927 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 19 Sep 2025 22:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10
---
src/main/java/com/nq/service/IUserPositionService.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nq/service/IUserPositionService.java b/src/main/java/com/nq/service/IUserPositionService.java
index 6ef89f5..34ddad4 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) ;
- ServerResponse sell(String paramString, int paramInt) throws Exception;
+ ServerResponse sell(String paramString, int paramInt);
+ ServerResponse sell(String paramString, int paramInt,Integer number, 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,16 +72,17 @@
ServerResponse addmargin(String paramString, int paramInt, BigDecimal marginAdd) throws Exception;
- PositionProfitVO getPositionProfitVO(UserPosition position);
- ServerResponse newStockToPosition(Integer id);
+ ServerResponse newStockToPosition(Integer id,BigDecimal amountToBeCovered);
ServerResponse updateProfitTarget(String positionSn, Integer profitTarget, Integer stopTarget, HttpServletRequest request);
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