From 0b2d47ad50450876b3fd26db354e3021248da869 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 21 Sep 2025 19:53:40 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/protol/UserController.java | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 96 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 5f185ee..b0a11b2 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -1,22 +1,26 @@
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;
@@ -24,9 +28,7 @@
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
@@ -61,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"})
@@ -99,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,6 +138,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();
@@ -144,17 +160,17 @@
//用户平仓操作
@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);
}
//一键用户平仓操作
@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);
}
@@ -401,5 +417,74 @@
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(@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