From c134d6137dff1d4533b12a07f85e44a1d7d57362 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 24 Apr 2025 23:03:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/protol/UserController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 8710115..31cf362 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -61,7 +61,8 @@
@Autowired
IUserRechargeService iUserRechargeService;
-
+ @Autowired
+ IUserAssetsServices iUserAssetsServices;
@Autowired
IApplyLeverServices iApplyLeverServices;
@@ -130,6 +131,32 @@
buyOrderCreated.set(false);
}
}
+
+ //用户下单买入股票
+ @RequestMapping({"goldCrudeOilbuy.do"})
+ @ResponseBody
+ public ServerResponse goldCrudeOilbuy(@RequestParam("name") String name,
+ @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) {
+ buyLock.lock();
+ try {
+ if (buyOrderCreated.get()) {
+ return ServerResponse.createByErrorMsg("当前下单人数过多，请稍后重试", request);
+ }
+ buyOrderCreated.set(true);
+ return this.iUserPositionService.goldCrudeOilbuy(name, buyNum,lever,profitTarget,stopLoss, request);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ServerResponse.createByErrorMsg("订单异常，请稍后重试", request);
+ } finally{
+ buyLock.unlock();
+ buyOrderCreated.set(false);
+ }
+ }
+
//修改涨跌板
@RequestMapping({"updateProfitTarget.do"})
@ResponseBody
@@ -145,8 +172,8 @@
//用户平仓操作
@RequestMapping({"sell.do"})
@ResponseBody
- public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
- return this.iUserPositionService.sell(positionSn, 1,request);
+ public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn,@RequestParam("number") Integer number) {
+ return this.iUserPositionService.sell(positionSn,1,number,request);
}
@@ -328,11 +355,22 @@
return this.iUserStockSubscribeService.userSubmit(id,request);
}
- @RequestMapping({"transfer.do"})
+// @RequestMapping({"transfer.do"})
+// @ResponseBody
+// public ServerResponse transfer(@RequestParam("fromType") String fromType, @RequestParam("toType") String toType,
+// @RequestParam("amt") String amt, HttpServletRequest request) {
+// return iUserService.transfer(fromType, toType, amt,request);
+// }
+
+ @RequestMapping("transfer.do")
@ResponseBody
- public ServerResponse transfer(@RequestParam("fromType") String fromType, @RequestParam("toType") String toType,
- @RequestParam("amt") String amt, HttpServletRequest request) {
- return iUserService.transfer(fromType, toType, amt,request);
+ public ServerResponse transfer(
+ @RequestParam("userId") Integer userId,
+ @RequestParam("disbursementAccount") String disbursementAccount,
+ @RequestParam("depositAccount") String depositAccount,
+ @RequestParam("amt") String amt, HttpServletRequest request
+ ){
+ return iUserAssetsServices.transfer(userId,disbursementAccount,depositAccount,amt,request);
}
--
Gitblit v1.9.3