From 8dead84802eaebdaf2c208a25eddd9b626e37da6 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Mon, 03 Nov 2025 21:58:02 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/controller/protol/UserController.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index bb70712..4bd5c42 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -108,6 +108,12 @@
         return this.iUserService.getMoney(request);
     }
 
+    @RequestMapping("getWeeklyProfit.do")
+    @ResponseBody
+    public ServerResponse getWeeklyProfit( HttpServletRequest request) {
+        return this.iUserService.getWeeklyProfit(request);
+    }
+
     //查询用户自选股
     @RequestMapping({"queryMyOption.do"})
     @ResponseBody
@@ -123,14 +129,15 @@
                               @RequestParam("buyType") Integer buyType,
                               @RequestParam("lever") Integer lever,
                               @RequestParam(value = "profitTarget",required = false)
-                                  BigDecimal profitTarget,@RequestParam(value = "stopLoss",required = false) BigDecimal stopLoss, HttpServletRequest request) {
+                                  BigDecimal profitTarget,@RequestParam(value = "stopLoss",required = false) BigDecimal stopLoss,
+                              @RequestParam(value = "preMarketPrice",required = false) BigDecimal preMarketPrice,HttpServletRequest request) {
         buyLock.lock();
         try {
             if (buyOrderCreated.get()) {
                 return ServerResponse.createByErrorMsg("当前下单人数过多,请稍后重试", request);
             }
             buyOrderCreated.set(true);
-            return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss, request);
+            return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss,preMarketPrice, request);
         } catch (Exception e) {
             e.printStackTrace();
             return ServerResponse.createByErrorMsg("订单异常,请稍后重试", request);
@@ -162,9 +169,9 @@
     //一键用户平仓操作
     @RequestMapping({"allsell.do"})
     @ResponseBody
-    public ServerResponse allsell(@RequestParam("stockType") String positionSn,HttpServletRequest request) {
+    public ServerResponse allsell(HttpServletRequest request) {
         try {
-            return this.iUserPositionService.allSell(request,positionSn);
+            return this.iUserPositionService.allSell(request);
         } catch (Exception e) {
             return  ServerResponse.createByErrorMsg("Sell Fail",request);
         }

--
Gitblit v1.9.3