From 854aa5b79d3906b335524f09581f3a567a7bad49 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Thu, 30 Oct 2025 18:23:34 +0800
Subject: [PATCH] 周收益、代理后台入金 充值
---
src/main/java/com/nq/controller/protol/UserController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index bfa4713..4bd5c42 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -108,6 +108,12 @@
return this.iUserService.getMoney(request);
}
+ @RequestMapping("getWeeklyProfit.do")
+ @ResponseBody
+ public ServerResponse getWeeklyProfit( HttpServletRequest request) {
+ return this.iUserService.getWeeklyProfit(request);
+ }
+
//查询用户自选股
@RequestMapping({"queryMyOption.do"})
@ResponseBody
@@ -123,14 +129,15 @@
@RequestParam("buyType") Integer buyType,
@RequestParam("lever") Integer lever,
@RequestParam(value = "profitTarget",required = false)
- BigDecimal profitTarget,@RequestParam(value = "stopLoss",required = false) BigDecimal stopLoss, HttpServletRequest request) {
+ BigDecimal profitTarget,@RequestParam(value = "stopLoss",required = false) BigDecimal stopLoss,
+ @RequestParam(value = "preMarketPrice",required = false) BigDecimal preMarketPrice,HttpServletRequest request) {
buyLock.lock();
try {
if (buyOrderCreated.get()) {
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,preMarketPrice, request);
} catch (Exception e) {
e.printStackTrace();
return ServerResponse.createByErrorMsg("订单异常，请稍后重试", request);
@@ -162,9 +169,9 @@
//一键用户平仓操作
@RequestMapping({"allsell.do"})
@ResponseBody
- public ServerResponse allsell(@RequestParam("stockType") String positionSn,HttpServletRequest request) {
+ public ServerResponse allsell(HttpServletRequest request) {
try {
- return this.iUserPositionService.allSell(request,positionSn);
+ return this.iUserPositionService.allSell(request);
} catch (Exception e) {
return ServerResponse.createByErrorMsg("Sell Fail",request);
}
@@ -464,7 +471,21 @@
* 充值2异步接收地址
*/
@PostMapping({"rechargeCallbackTwo.do"})
- public void rechargeCallbackTwo(TransactionStatusVo vo, HttpServletResponse response) throws IOException {
+ public void rechargeCallbackTwo(@RequestParam("status") String status,
+ @RequestParam("merchantid") String merchantid,
+ @RequestParam("out_trade_no") String outTradeNo,
+ @RequestParam("total_fee") String totalFee,
+ @RequestParam("poundage") String poundage,
+ @RequestParam("account_fee") String accountFee,
+ @RequestParam("sign") String sign, HttpServletResponse response) throws IOException {
+ TransactionStatusVo vo = new TransactionStatusVo();
+ vo.setStatus(status);
+ vo.setMerchantid(merchantid);
+ vo.setOut_trade_no(outTradeNo);
+ vo.setTotal_fee(totalFee);
+ vo.setPoundage(poundage);
+ vo.setAccount_fee(accountFee);
+ vo.setSign(sign);
payService.rechargeCallbackTwo(vo,response);
}
}
--
Gitblit v1.9.3