From bf876c24f9ecfa480c3e014202a03adb250354af Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 14 Mar 2025 20:07:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/protol/UserController.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 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..ab20b33 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -1,31 +1,34 @@
package com.nq.controller.protol;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.google.common.collect.Maps;
+import com.google.gson.Gson;
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 com.nq.utils.translate.GoogleTranslateUtil;
+import com.nq.vo.stock.UserStockSubscribeAddIn;
import org.apache.ibatis.annotations.Property;
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
@@ -60,16 +63,23 @@
@Autowired
IUserRechargeService iUserRechargeService;
-
+ @Autowired
+ PayServiceImpl payService;
@Autowired
IApplyLeverServices iApplyLeverServices;
+
+ @Autowired
+ IUserWithdrawService iUserWithdrawService;
private static final ThreadLocal<Boolean> orderCreated = ThreadLocal.withInitial(() -> false);
private final Lock lock = new ReentrantLock();
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 +132,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 +154,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);
}
@@ -300,7 +311,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,7 +320,7 @@
*/
@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);
}
/*新股申购-用户新股申购数据*/
@@ -355,14 +366,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 +411,45 @@
return iApplyLeverServices.applyLever(applyLever,request);
}
+ /**
+ * 充值第三方支付
+ */
+ @RequestMapping({"thirdPartyRecharge.do"})
+ @ResponseBody
+ public ServerResponse thirdPartyRecharge(@RequestParam("tradeAmoun") String tradeAmoun,HttpServletRequest request) {
+ payLock.lock();
+ try {
+ if (payCreated.get()) {
+ 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);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ServerResponse.createByErrorMsg("获取充值链接异常，请稍后重试", request);
+ } finally{
+ payLock.unlock();
+ payCreated.set(false);
+ }
+ }
+
+ /**
+ * 充值异步接收地址
+ */
+ @PostMapping({"rechargeCallback.do"})
+ public void rechargeCallback(PaymentResponse vo, HttpServletResponse response) throws IOException {
+ payService.rechargeCallback(vo,response);
+ }
+
+ /**
+ * 代付回调通知
+ */
+ @PostMapping({"noticePayment.do"})
+ public void noticePayment(TradeResultVO vo,HttpServletResponse response) throws IOException {
+ iUserWithdrawService.noticePayment(vo,response);
+ }
}
--
Gitblit v1.9.3