From 5a8a43d5edb7af016b76246d9e9f661f4363342e Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Thu, 18 Apr 2024 11:13:24 +0800
Subject: [PATCH] 修改自选BUG 汇率
---
src/main/java/com/nq/controller/protol/UserController.java | 114 +++++++++++++++------------------------------------------
1 files changed, 30 insertions(+), 84 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index dfe63cc..b2ac108 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -3,6 +3,7 @@
import com.google.common.collect.Maps;
import com.nq.common.ServerResponse;
+import com.nq.enums.EStockType;
import com.nq.pojo.StockSubscribe;
import com.nq.pojo.UserStockSubscribe;
import com.nq.service.*;
@@ -50,6 +51,12 @@
@Autowired
UserPendingorderService userPendingorderService;
+ @Autowired
+ IRateServices rateServices;
+
+ @Autowired
+ IUserRechargeService iUserRechargeService;
+
//添加到自选股
@RequestMapping({"addOption.do"})
@ResponseBody
@@ -81,9 +88,7 @@
@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);
}
//用户下单买入股票
@@ -95,13 +100,7 @@
@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);
- } catch (Exception e) {
- log.error("用户下单操作 = {}", e);
- }
- return serverResponse;
+ return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopTarget, request);
}
//修改涨跌板
@RequestMapping({"updateProfitTarget.do"})
@@ -119,22 +118,18 @@
@RequestMapping({"sell.do"})
@ResponseBody
public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
- try {
- return this.iUserPositionService.sell(positionSn, 1);
- } catch (Exception e) {
- return ServerResponse.createByErrorMsg("Sell Fail");
- }
+ return this.iUserPositionService.sell(positionSn, 1,request);
}
- //用户平仓操作
+ //一键用户平仓操作
@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");
+ return ServerResponse.createByErrorMsg("Sell Fail",request);
}
}
@@ -200,57 +195,11 @@
return serverResponse;
}
- @RequestMapping({"buyIndex.do"})
- @ResponseBody
- public ServerResponse buyIndex(@RequestParam("indexId") Integer indexId, @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.iUserIndexPositionService.buyIndex(indexId, buyNum, buyType, lever,profitTarget,stopTarget, request);
- } catch (Exception e) {
- log.error("用户下单指数操作 = {}", e);
- }
- return serverResponse;
- }
- @RequestMapping({"sellIndex.do"})
- @ResponseBody
- public ServerResponse sellIndex(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
- ServerResponse serverResponse = null;
- try {
- serverResponse = this.iUserIndexPositionService.sellIndex(positionSn, 1);
- } catch (Exception e) {
- log.error("用户平仓指数操作 = {}", e);
- }
- return serverResponse;
- }
- //期货交易 用户下单
- @RequestMapping({"buyFutures.do"})
- @ResponseBody
- public ServerResponse buyFutures(@RequestParam("FuturesId") Integer FuturesId, @RequestParam("buyNum") Integer buyNum, @RequestParam("buyType") Integer buyType, @RequestParam("lever") Integer lever, HttpServletRequest request) {
- ServerResponse serverResponse = null;
- try {
- serverResponse = this.iUserFuturesPositionService.buyFutures(FuturesId, buyNum, buyType, lever, request);
- } catch (Exception e) {
- log.error("用户下单 期货 操作 = {}", e);
- }
- return serverResponse;
- }
- @RequestMapping({"sellFutures.do"})
- @ResponseBody
- public ServerResponse sellFutures(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
- ServerResponse serverResponse = null;
- try {
- serverResponse = this.iUserFuturesPositionService.sellFutures(positionSn, 1);
- } catch (Exception e) {
- log.error("用户平仓 期货 操作 = {}", e);
- }
- return serverResponse;
- }
- @Autowired
- IUserRechargeService iUserRechargeService;
+
//查询 用户信息
@RequestMapping({"getUserInfo.do"})
@@ -306,17 +255,9 @@
return serverResponse;
}
- //资产互转
- @RequestMapping({"transAmt.do"})
- @ResponseBody
- public ServerResponse transAmt(@RequestParam("amt") Integer amt, @RequestParam("type") Integer type, HttpServletRequest request) {
- return this.iUserService.transAmt(amt, type, request);
- }
/**
* 用户新股列表
- * @param pageNum
- * @param pageSize
* @param name
* @param code
* @param zt
@@ -353,22 +294,11 @@
return this.iUserStockSubscribeService.userSubmit(id,request);
}
-
- /**
- * vip抢筹 （涨停板买入）
- *
- */
@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;
+ return iUserService.transfer(fromType, toType, amt,request);
}
@@ -404,4 +334,20 @@
}
+
+ @RequestMapping({"getMoenyLog.do"})
+ @ResponseBody
+ public ServerResponse getMoenyLog(@RequestParam("type") String stockCode, HttpServletRequest request) {
+ return this.iUserService.getMoenyLog(stockCode, request);
+ }
+
+
+ @RequestMapping({"currencyRate.do"})
+ @ResponseBody
+ public ServerResponse currencyRate(@RequestParam("fromType") String stockCode,
+ @RequestParam("toType") String toType, HttpServletRequest request) {
+ return ServerResponse.createBySuccess(rateServices.currencyRate(EStockType.getEStockTypeByCode(stockCode), EStockType.getEStockTypeByCode(toType)));
+ }
+
+
}
--
Gitblit v1.9.3