From 4046f94a57f0c10e9509a49ad0d37d701aeb8186 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Tue, 02 Apr 2024 23:47:51 +0800
Subject: [PATCH] 修复自选bug 和 增加流水日志

---
 src/main/java/com/nq/controller/protol/UserController.java |   65 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index d3eae51..970c355 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -71,13 +71,17 @@
         return this.iUserService.isOption(code, request);
     }
 
+    @RequestMapping("getMoney.do")
+    @ResponseBody
+    public ServerResponse getMoney( HttpServletRequest request) {
+        return this.iUserService.getMoney(request);
+    }
+
     //查询用户自选股
     @RequestMapping({"queryMyOption.do"})
     @ResponseBody
     public ServerResponse queryMyOption(@RequestParam("code") String code, HttpServletRequest request) {
-//        return this.iUserService.queryMyOption(code, request);
-
-        return null;
+        return this.iUserService.queryMyOption(code, request);
     }
 
     //用户下单买入股票
@@ -113,18 +117,40 @@
     @RequestMapping({"sell.do"})
     @ResponseBody
     public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
-        ServerResponse serverResponse = null;
         try {
-            serverResponse = this.iUserPositionService.sell(positionSn, 1);
+            return this.iUserPositionService.sell(positionSn, 1);
         } catch (Exception e) {
-            log.error("用户平仓操作 = {}", e);
+            return  ServerResponse.createByErrorMsg("Sell Fail");
         }
-        return serverResponse;
     }
+
+
+    //一键用户平仓操作
+    @RequestMapping({"allsell.do"})
+    @ResponseBody
+    public ServerResponse allsell(@RequestParam("stockType") String positionSn,HttpServletRequest request) {
+        try {
+            return this.iUserPositionService.allSell(request,positionSn);
+        } catch (Exception e) {
+            return  ServerResponse.createByErrorMsg("Sell Fail");
+        }
+    }
+
+
+
+
+
     //挂单操作-添加
     @RequestMapping({"addOrder.do"})
     @ResponseBody
-    public ServerResponse addOrder(HttpServletRequest request, @RequestParam("stockId") String 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,@RequestParam(value = "targetPrice",required = false) BigDecimal targetPrice) {
+    public ServerResponse addOrder(HttpServletRequest request,
+                                   @RequestParam("stockId") String 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,
+                                   @RequestParam(value = "targetPrice",required = false) BigDecimal targetPrice) {
         ServerResponse serverResponse = null;
         try {
             serverResponse = this.userPendingorderService.addOrder(stockId, buyNum, buyType, lever,profitTarget,stopTarget,targetPrice, request);
@@ -287,8 +313,6 @@
 
     /**
      * 用户新股列表
-     * @param pageNum
-     * @param pageSize
      * @param name
      * @param code
      * @param zt
@@ -325,6 +349,20 @@
         return this.iUserStockSubscribeService.userSubmit(id,request);
     }
 
+    @RequestMapping({"transfer.do"})
+    @ResponseBody
+    public ServerResponse transfer(@RequestParam("fromType") String fromType, @RequestParam("toType") String toType,
+                                   @RequestParam("amt") String amt,  HttpServletRequest request) {
+        ServerResponse serverResponse = null;
+        try {
+            serverResponse = this.iUserService.transfer(fromType, toType, amt,request);
+        } catch (Exception e) {
+            log.error("vip抢筹下单操作出错 = {}", e);
+        }
+        return serverResponse;
+    }
+
+
     /**
      * vip抢筹 (涨停板买入)
      *
@@ -357,4 +395,11 @@
     }
 
 
+    //大宗下单列表
+    @RequestMapping({"getMoenyLog.do"})
+    @ResponseBody
+    public ServerResponse getMoenyLog(@RequestParam("type") String stockCode, HttpServletRequest request) {
+        return this.iUserService.getMoenyLog(stockCode, request);
+    }
+
 }

--
Gitblit v1.9.3