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/controller/protol/UserController.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 6c4315c..d05b469 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -23,6 +23,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -60,10 +61,11 @@
@Autowired
IUserRechargeService iUserRechargeService;
-
-
@Autowired
IApplyLeverServices iApplyLeverServices;
+
+ @Autowired
+ private ISiteVipRobService iSiteVipRobService;
private static final ThreadLocal<Boolean> orderCreated = ThreadLocal.withInitial(() -> false);
private final Lock lock = new ReentrantLock();
@@ -120,13 +122,23 @@
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,request,null);
} catch (Exception e) {
return ServerResponse.createByErrorMsg("订单异常，请稍后重试", request);
} finally{
buyLock.unlock();
buyOrderCreated.set(false);
}
+ }
+ @GetMapping("checkStockVip.do")
+ @ResponseBody
+ public ServerResponse checkStockVip(@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 = "stopLoss",required = false) BigDecimal stopLoss, HttpServletRequest request){
+ return ServerResponse.createBySuccess(iUserPositionService.checkStockVip(stockId,buyNum,buyType,lever,profitTarget,stopLoss,request));
}
//修改涨跌板
@RequestMapping({"updateProfitTarget.do"})
@@ -144,7 +156,7 @@
@RequestMapping({"sell.do"})
@ResponseBody
public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
- return this.iUserPositionService.sell(positionSn, 1,request);
+ return this.iUserPositionService.sell(positionSn, 1);
}
@@ -264,21 +276,24 @@
@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");
+ try {
+ String path = request.getSession().getServletContext().getRealPath("upload");
- ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
- if (serverResponse.isSuccess()) {
- String targetFileName = serverResponse.getData().toString();
- String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
+ ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
+ if (serverResponse.isSuccess()) {
+ String targetFileName = serverResponse.getData().toString();
+ String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
+ Map fileMap = Maps.newHashMap();
+ fileMap.put("uri", targetFileName);
+ fileMap.put("url", url);
-
- Map fileMap = Maps.newHashMap();
- fileMap.put("uri", targetFileName);
- fileMap.put("url", url);
-
- return ServerResponse.createBySuccess(fileMap);
+ return ServerResponse.createBySuccess(fileMap);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("上传失败",e);
}
- return serverResponse;
+ return ServerResponse.createByErrorMsg("上传失败");
}
--
Gitblit v1.9.3