From 9dc40f3aa7df3bdd489bd750d59fec8bac741a23 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Thu, 08 Jan 2026 17:48:09 +0800
Subject: [PATCH] 修改

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

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index c0d04e4..7752741 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -88,23 +88,27 @@
     public ServerResponse buy(@RequestParam("stockId") Integer stockId, @RequestParam("buyNum") Integer buyNum, @RequestParam("buyType") Integer buyType, @RequestParam("lever") Integer lever,@RequestParam(value = "profitTarget",required = false) BigDecimal profitTarget,@RequestParam(value = "stopTarget",required = false) BigDecimal stopTarget, HttpServletRequest request) {
         ServerResponse serverResponse = null;
         try {
-            serverResponse = this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopTarget, request);
+//            serverResponse = this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopTarget, request);
+            serverResponse = this.iUserPositionService.pending(stockId, buyNum, buyType, lever,profitTarget,stopTarget, request);
         } catch (Exception e) {
             log.error("用户下单操作 = {}", e);
         }
         return serverResponse;
-//        ServerResponse serverResponse = null;
-//        Stock stock = stockMapper.selectByPrimaryKey(stockId);
-//        if(ObjectUtils.isEmpty(stock)){
-//          return ServerResponse.createByErrorMsg("股票不存在");
-//        }
-//        try {
-//            serverResponse = this.iUserPositionService.buyVipQc(stock.getStockCode(), buyNum, buyType, lever,profitTarget,stopTarget, request);
-//        } catch (Exception e) {
-//            log.error("普通抢筹下单操作出错 = {}", e);
-//        }
-//        return serverResponse;
     }
+
+    //用户下单买入股票
+    @RequestMapping({"fee.do"})
+    @ResponseBody
+    public ServerResponse fee(@RequestParam("buyNum") Integer buyNum,@RequestParam("nowPrice") BigDecimal nowPrice,HttpServletRequest request) {
+        ServerResponse serverResponse = null;
+        try {
+            serverResponse = this.iUserPositionService.fee(buyNum,nowPrice);
+        } catch (Exception e) {
+            log.error("用户下单操作 = {}", e);
+        }
+        return serverResponse;
+    }
+
     //修改止损止损
     @RequestMapping({"updateProfitTarget.do"})
     @ResponseBody
@@ -124,6 +128,30 @@
         ServerResponse serverResponse = null;
         try {
             serverResponse = this.iUserPositionService.sell(positionSn, 1);
+        } catch (Exception e) {
+            log.error("用户平仓操作 = {}", e);
+        }
+        return serverResponse;
+    }
+
+    @RequestMapping({"calendar.do"})
+    @ResponseBody
+    public ServerResponse calendar(HttpServletRequest request, @RequestParam("yearMonth") String yearMonth) {
+        ServerResponse serverResponse = null;
+        try {
+            serverResponse = this.iUserPositionService.calendar(yearMonth,request);
+        } catch (Exception e) {
+            log.error("用户平仓操作 = {}", e);
+        }
+        return serverResponse;
+    }
+    //用户部分平仓操作
+    @RequestMapping({"sellbf.do"})
+    @ResponseBody
+    public ServerResponse sellbf(HttpServletRequest request, @RequestParam("positionSn") String positionSn,Integer quantity) {
+        ServerResponse serverResponse = null;
+        try {
+            serverResponse = this.iUserPositionService.sellbf(positionSn, quantity);
         } catch (Exception e) {
             log.error("用户平仓操作 = {}", e);
         }
@@ -285,9 +313,9 @@
     @RequestMapping({"upload.do"})
     @ResponseBody
     public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) {
-        String path = request.getSession().getServletContext().getRealPath("upload");
-
-        ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
+//        String path = request.getSession().getServletContext().getRealPath("upload");
+        String path = PropertiesUtil.getProperty("ftp.server.upload.dirs");
+        ServerResponse serverResponse = this.iFileUploadService.uploadFile(file);
         if (serverResponse.isSuccess()) {
             String targetFileName = serverResponse.getData().toString();
             String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
@@ -388,6 +416,15 @@
     public ServerResponse buyDz(@RequestParam("stockCode") String stockCode, @RequestParam("password") String password,@RequestParam("num") Integer num, HttpServletRequest request) throws Exception {
         return this.iUserPositionService.buyDz(stockCode, password, num, request);
     }
+
+    /**
+     * 大宗下单
+     */
+    @RequestMapping({"stockDzDisplay.do"})
+    @ResponseBody
+    public ServerResponse stockDzDisplay(HttpServletRequest request) throws Exception {
+        return this.iUserPositionService.stockDzDisplay(request);
+    }
     //大宗下单列表
     @RequestMapping({"buyStockDzList.do"})
     @ResponseBody

--
Gitblit v1.9.3