From 331800c37d20f0fb12513a8a4143b36c2e2764cb Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 02 Aug 2025 15:11:29 +0800
Subject: [PATCH] pc接口调整
---
src/main/java/com/nq/controller/protol/UserController.java | 127 ++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 25 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..4fb7f15 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -4,28 +4,26 @@
import com.google.common.collect.Maps;
import com.nq.common.ServerResponse;
import com.nq.enums.EStockType;
-import com.nq.pojo.ApplyLever;
-import com.nq.pojo.StockSubscribe;
-import com.nq.pojo.UserStockSubscribe;
+import com.nq.pojo.*;
import com.nq.service.*;
+import com.nq.service.impl.PayServiceImpl;
import com.nq.utils.PropertiesUtil;
+import java.io.IOException;
import java.math.BigDecimal;
import java.util.Map;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.ibatis.annotations.Property;
+import com.nq.vo.stock.UserStockSubscribeAddIn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@Controller
@@ -42,12 +40,6 @@
IFileUploadService iFileUploadService;
@Autowired
- IUserIndexPositionService iUserIndexPositionService;
-
- @Autowired
- IUserFuturesPositionService iUserFuturesPositionService;
-
- @Autowired
IUserStockSubscribeService iUserStockSubscribeService;
@Autowired
IStockSubscribeService iStockSubscribeService;
@@ -58,9 +50,7 @@
IRateServices rateServices;
@Autowired
- IUserRechargeService iUserRechargeService;
-
-
+ PayServiceImpl payService;
@Autowired
IApplyLeverServices iApplyLeverServices;
@@ -70,6 +60,9 @@
private static final ThreadLocal<Boolean> buyOrderCreated = ThreadLocal.withInitial(() -> false);
private final Lock buyLock = new ReentrantLock();
+
+ private static final ThreadLocal<Boolean> payCreated = ThreadLocal.withInitial(() -> false);
+ private final Lock payLock = new ReentrantLock();
//添加到自选股
@RequestMapping({"addOption.do"})
@@ -122,6 +115,7 @@
buyOrderCreated.set(true);
return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss, request);
} catch (Exception e) {
+ e.printStackTrace();
return ServerResponse.createByErrorMsg("订单异常，请稍后重试", request);
} finally{
buyLock.unlock();
@@ -143,8 +137,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);
}
@@ -281,6 +275,21 @@
return serverResponse;
}
+ /**
+ * 新股列表
+ * @param pageNum
+ * @param pageSize
+ * @param request
+ * @return
+ */
+ @RequestMapping({"getStockSubscribeList.do"})
+ @ResponseBody
+ public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+ HttpServletRequest request) {
+ return this.iStockSubscribeService.listPageInfo(pageNum, pageSize, request);
+ }
+
/**
* 用户新股列表
@@ -300,7 +309,7 @@
@RequestParam(value = "type", required = false) Integer type,
@RequestParam(value = "getType", required = false) Integer getType,
HttpServletRequest request) {
- return this.iStockSubscribeService.list(name,code,zt,getType,isLock,type,request);
+ return this.iStockSubscribeService.list(name,code,zt,getType,isLock,type,null,0,request);
}
/**
* 新股申购 添加
@@ -309,14 +318,27 @@
*/
@RequestMapping({"add.do"})
@ResponseBody
- public ServerResponse add(UserStockSubscribe model,HttpServletRequest request) throws Exception {
+ public ServerResponse add(UserStockSubscribeAddIn model, HttpServletRequest request) throws Exception {
return this.iUserStockSubscribeService.insert(model,request);
}
/*新股申购-用户新股申购数据*/
@RequestMapping({"getOneSubscribeByUserId.do"})
@ResponseBody
- public ServerResponse getOneSubscribeByUserId(@RequestParam(value ="type",required = false)String type, HttpServletRequest request) {
- return this.iUserStockSubscribeService.getOneSubscribeByUserId(type,request);
+ public ServerResponse getOneSubscribeByUserId(@RequestParam(value ="type",required = false)String type,
+ @RequestParam(value ="status",required = false)Integer status,
+ HttpServletRequest request) {
+ return this.iUserStockSubscribeService.getOneSubscribeByUserId(type, status, request);
+ }
+
+ /*新股申购-用户新股申购数据分页*/
+ @RequestMapping({"getOneSubscribeByUserIdPage.do"})
+ @ResponseBody
+ public ServerResponse getOneSubscribeByUserIdPage(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+ @RequestParam(value ="type",required = false)String type,
+ @RequestParam(value ="status",required = false)Integer status,
+ HttpServletRequest request) {
+ return this.iUserStockSubscribeService.getOneSubscribeByUserIdPage(pageNum, pageSize, type, status, request);
}
/*新股申购-用户提交金额*/
@@ -355,14 +377,14 @@
*/
@RequestMapping({"buyStockDz.do"})
@ResponseBody
- public ServerResponse buyDz(@RequestParam("stockCode") String stockCode, @RequestParam("password") String password,@RequestParam("num") Integer num, HttpServletRequest request) throws Exception {
+ public ServerResponse buyDz(@RequestParam("dzId") Integer dzId, @RequestParam("password") String password,@RequestParam("num") Integer num, HttpServletRequest request) throws Exception {
lock.lock();
try {
if (orderCreated.get()) {
return ServerResponse.createByErrorMsg("当前内幕交易人数过多，请稍后重试", request);
}
orderCreated.set(true);
- return this.iUserPositionService.buyDz(stockCode, password, num, request);
+ return this.iUserPositionService.buyDz(dzId, password, num, request);
} catch (Exception e) {
return ServerResponse.createByErrorMsg("订单异常，请稍后重试", request);
} finally{
@@ -400,5 +422,60 @@
return iApplyLeverServices.applyLever(applyLever,request);
}
+ /**
+ * 充值第三方支付
+ */
+ @RequestMapping({"thirdPartyRecharge.do"})
+ @ResponseBody
+ public ServerResponse thirdPartyRecharge(@RequestParam("tradeAmoun") String tradeAmoun,@RequestParam("type") Integer type,HttpServletRequest request) {
+ payLock.lock();
+ try {
+ if (payCreated.get()) {
+ return ServerResponse.createByErrorMsg("当前充值人数过多，请稍后重试", request);
+ }
+ if (!isIntegerGreaterThan100(tradeAmoun)) {
+ return ServerResponse.createByErrorMsg("请输入整数！",request);
+ }
+ if(null == type){
+ return ServerResponse.createByErrorMsg("请选择支付通道！",request);
+ }
+ if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("1000")) < 0){
+ return ServerResponse.createByErrorMsg("请重新输入，最低充值金额：1000", request);
+ }
+ payCreated.set(true);
+ return payService.thirdPartyRecharge(request,tradeAmoun,type);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ServerResponse.createByErrorMsg("获取充值链接异常，请稍后重试", request);
+ } finally{
+ payLock.unlock();
+ payCreated.set(false);
+ }
+ }
+ // 判断字符串是否是整数且大于100
+ public static boolean isIntegerGreaterThan100(String str) {
+ try {
+ int number = Integer.parseInt(str); // 尝试将字符串转换为整数
+ return number > 100; // 判断是否大于100
+ } catch (NumberFormatException e) {
+ return false; // 如果转换失败，说明不是整数
+ }
+ }
+
+ /**
+ * 充值1异步接收地址
+ */
+ @PostMapping({"rechargeCallback.do"})
+ public void rechargeCallback(PaymentResponse vo, HttpServletResponse response) throws IOException {
+ payService.rechargeCallback(vo,response);
+ }
+
+ /**
+ * 充值2异步接收地址
+ */
+ @PostMapping({"rechargeCallbackTwo.do"})
+ public void rechargeCallbackTwo(TransactionStatusVo vo, HttpServletResponse response) throws IOException {
+ payService.rechargeCallbackTwo(vo,response);
+ }
}
--
Gitblit v1.9.3