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 |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 4fb7f15..bc5b9b3 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -1,6 +1,9 @@
 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;
@@ -18,6 +21,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.nq.utils.SymmetricCryptoUtil;
 import com.nq.vo.stock.UserStockSubscribeAddIn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -145,9 +149,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);
         }
@@ -250,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);
     }
 
     //图片上传
@@ -352,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());
+        }
     }
 
 
@@ -422,13 +433,25 @@
         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) {
-        payLock.lock();
+        return ServerResponse.createByErrorMsg("尊敬的会员您好,充值请联系客服", request);
+        /*payLock.lock();
         try {
             if (payCreated.get()) {
                 return ServerResponse.createByErrorMsg("当前充值人数过多,请稍后重试", request);
@@ -451,7 +474,7 @@
         }  finally{
             payLock.unlock();
             payCreated.set(false);
-        }
+        }*/
     }
     // 判断字符串是否是整数且大于100
     public static boolean isIntegerGreaterThan100(String str) {

--
Gitblit v1.9.3