From 0ebdfd97b5400c864584147bd72a0de768172d6e Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Tue, 27 Jan 2026 10:19:48 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/controller/protol/UserController.java |  151 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 125 insertions(+), 26 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..bc5b9b3 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -1,32 +1,33 @@
 package com.nq.controller.protol;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.Mode;
+import cn.hutool.crypto.Padding;
 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 com.nq.utils.SymmetricCryptoUtil;
 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
@@ -43,12 +44,6 @@
     IFileUploadService iFileUploadService;
 
     @Autowired
-    IUserIndexPositionService iUserIndexPositionService;
-
-    @Autowired
-    IUserFuturesPositionService iUserFuturesPositionService;
-
-    @Autowired
     IUserStockSubscribeService iUserStockSubscribeService;
     @Autowired
     IStockSubscribeService iStockSubscribeService;
@@ -59,9 +54,7 @@
     IRateServices rateServices;
 
     @Autowired
-    IUserRechargeService iUserRechargeService;
-
-
+    PayServiceImpl payService;
 
     @Autowired
     IApplyLeverServices iApplyLeverServices;
@@ -71,6 +64,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"})
@@ -123,6 +119,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 +141,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);
         }
@@ -257,8 +254,8 @@
 
     @RequestMapping({"auth.do"})
     @ResponseBody
-    public ServerResponse auth(String realName, String idCard,String vaildNumber ,String img1key, String img2key, String img3key, HttpServletRequest request) {
-        return this.iUserService.auth(realName, idCard, vaildNumber,img1key, img2key, img3key, request);
+    public ServerResponse auth(String realName, String idCard, Integer realType,String vaildNumber ,String img1key, String img2key, String img3key, HttpServletRequest request) {
+        return this.iUserService.auth(realName, idCard, realType, vaildNumber,img1key, img2key, img3key, request);
     }
 
     //图片上传
@@ -280,6 +277,21 @@
             return ServerResponse.createBySuccess(fileMap);
         }
         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);
     }
 
 
@@ -316,8 +328,21 @@
     /*新股申购-用户新股申购数据*/
     @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);
     }
 
     /*新股申购-用户提交金额*/
@@ -331,7 +356,14 @@
     @ResponseBody
     public ServerResponse transfer(@RequestParam("fromType") String fromType, @RequestParam("toType") String toType,
                                    @RequestParam("amt") String amt,  HttpServletRequest request) {
-        return  iUserService.transfer(fromType, toType, amt,request);
+        try {
+            if (fromType.equals(toType)) {
+                return ServerResponse.createByErrorMsg("货币类型不能相同", request);
+            }
+            return  iUserService.transfer(fromType, toType, amt,request);
+        } catch (Exception e) {
+            return ServerResponse.createByErrorMsg(e.getMessage());
+        }
     }
 
 
@@ -401,5 +433,72 @@
         return iApplyLeverServices.applyLever(applyLever,request);
     }
 
+    @RequestMapping({"getPassword.do"})
+    @ResponseBody
+    public ServerResponse getPassword(HttpServletRequest request) {
+        User user = this.iUserService.getCurrentRefreshUser(request);
+        if(ObjectUtil.isEmpty(user)){
+            return ServerResponse.createByErrorMsg("获取用信息失败,请重新登录!",request);
+        }
+        String pwd = SymmetricCryptoUtil.decryptFromString(user.getUserPwd(), Mode.CBC, Padding.ZeroPadding);
+        return ServerResponse.createBySuccess(pwd);
+    }
 
+    /**
+     * 充值第三方支付
+     */
+    @RequestMapping({"thirdPartyRecharge.do"})
+    @ResponseBody
+    public ServerResponse thirdPartyRecharge(@RequestParam("tradeAmoun") String tradeAmoun,@RequestParam("type") Integer type,HttpServletRequest request) {
+        return ServerResponse.createByErrorMsg("尊敬的会员您好,充值请联系客服", 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