From 898878faebb3685994b44eb3e06dc8105e6adf7f Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 12 Nov 2025 14:51:20 +0800
Subject: [PATCH] 删除后台资金校验

---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java                 |    4 +-
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodController.java        |   12 +++---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/BankCardController.java                |    4 +-
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodConfigController.java  |    8 ++--
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java                   |   18 ++++----
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/ExchangeApplyOrderController.java |    8 ++--
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java                     |    4 +-
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserAllRecomController.java           |    4 +-
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java
index 2c8550d..dc6b12b 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java
@@ -151,7 +151,7 @@
     @ApiOperation(value = "新增")
     @PostMapping("add")
     public Result<?> add(@RequestBody @Valid AgentAndModel model) {
-        sysUserService.checkSafeWord(model.getSafeword());
+        //sysUserService.checkSafeWord(model.getSafeword());
         String roleName = model.isOperaAuthority() ? Constants.SECURITY_ROLE_AGENT : Constants.SECURITY_ROLE_AGENTLOW;
         sysUserOperService.addAgent(model.getUserName(),
                 passwordManager.decryptPassword(model.getPassword()), "000000", roleName, model.getRemarks(), model.getParentsUseCode(),
@@ -169,7 +169,7 @@
     @ApiOperation(value = "重置登录密码")
     @PostMapping("restPassword")
     public Result<?> add(@RequestBody @Valid RestPasswordModel model) {
-        sysUserService.checkSafeWord(model.getSafeword());
+        //sysUserService.checkSafeWord(model.getSafeword());
         sysUserOperService.restPassword(passwordManager.decryptPassword(model.getPassword()),model.getId());
         return Result.ok(null);
     }
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/BankCardController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/BankCardController.java
index c8cbdda..d0ed849 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/BankCardController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/BankCardController.java
@@ -163,7 +163,7 @@
                 throw new YamiShopBindException("系统繁忙,请稍后重试");
             }
             lock = true;
-            sysUserService.checkSafeWord(model.getSafeword());
+            //sysUserService.checkSafeWord(model.getSafeword());
             c2cOrderService.manualRelease(order, SecurityUtils.getSysUser().getUsername());
             ThreadUtils.sleep(100);
         } catch (Exception e) {
@@ -218,7 +218,7 @@
 
             }
 
-            sysUserService.checkSafeWord(model.getSafeword());
+            //sysUserService.checkSafeWord(model.getSafeword());
             c2cOrderService.saveOrderPay(model.getOrder_no(), model.getSafeword(), SecurityUtils.getSysUser().getUsername(), model.getPayment_method_id_order_pay());
             C2cOrder c2cOrder = c2cOrderService.get(model.getOrder_no());
             User orderUser = userService.getById(c2cOrder.getPartyId());
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodConfigController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodConfigController.java
index 7a5ea94..43b2259 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodConfigController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodConfigController.java
@@ -278,9 +278,9 @@
         if (StringUtils.isEmpty(param_name1)) {
             return "参数名1必填";
         }
-        if (StringUtils.isEmpty(login_safeword)) {
+        /*if (StringUtils.isEmpty(login_safeword)) {
             return "请填写资金密码";
-        }
+        }*/
         return "";
     }
 
@@ -312,7 +312,7 @@
         if (!StringUtils.isEmpty(error)) {
             throw new YamiShopBindException(error);
         }
-        sysUserService.checkSafeWord(config.getLoginSafeword());
+        //sysUserService.checkSafeWord(config.getLoginSafeword());
         C2cPaymentMethodConfig cfg = this.c2cPaymentMethodConfigService.getById(id);
         if (null == cfg) {
             throw new YamiShopBindException("支付方式模板不存在");
@@ -378,7 +378,7 @@
     @ApiOperation(value = "删除")
     @PostMapping("delete")
     public Result<?> delete(@RequestBody @Valid C2cPaymentMethodConfigDeleteModel model) {
-        sysUserService.checkSafeWord(model.getLoginSafeword());
+        //sysUserService.checkSafeWord(model.getLoginSafeword());
         C2cPaymentMethodConfig cfg = this.c2cPaymentMethodConfigService.getById(model.getId());
 
         this.c2cPaymentMethodConfigService.delete(model.getId());
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodController.java
index 795b4cc..4348fbf 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodController.java
@@ -139,7 +139,7 @@
         if (!StringUtils.isNullOrEmpty(error)) {
             throw new YamiShopBindException(error);
         }
-        sysUserService.checkSafeWord(model.getLoginSafeword());
+        //sysUserService.checkSafeWord(model.getLoginSafeword());
         User party = userService.findUserByUserCode(model.getUserCode());
         if (null == party) {
             throw new YamiShopBindException("用户不存在");
@@ -255,7 +255,7 @@
         if (!StringUtils.isNullOrEmpty(error)) {
             throw new YamiShopBindException(error);
         }
-        sysUserService.checkSafeWord(model.getLoginSafeword());
+        //sysUserService.checkSafeWord(model.getLoginSafeword());
         C2cPaymentMethod method = adminC2cPaymentMethodService.get(model.getId());
         if (null == method) {
             throw new YamiShopBindException("支付方式不存在");
@@ -367,9 +367,9 @@
         if (StringUtils.isNullOrEmpty(param_value1)) {
             return "参数值1必填";
         }
-        if (StringUtils.isNullOrEmpty(login_safeword)) {
+        /*if (StringUtils.isNullOrEmpty(login_safeword)) {
             return "资金密码错误";
-        }
+        }*/
         return "";
     }
 
@@ -381,9 +381,9 @@
         if (StringUtils.isNullOrEmpty(param_value1)) {
             return "参数值1必填";
         }
-        if (StringUtils.isNullOrEmpty(login_safeword)) {
+        /*if (StringUtils.isNullOrEmpty(login_safeword)) {
             return "资金密码错误";
-        }
+        }*/
         return "";
     }
 }
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java
index d6545de..b664d05 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java
@@ -88,11 +88,11 @@
     @ApiOperation(value = "更新")
     @PostMapping("update")
     public Result<?> update(@RequestBody @Valid CmsModel model) {
-        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
+        /*model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
         SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
         if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
             throw new YamiShopBindException("资金密码不正确!");
-        }
+        }*/
         Cms cms = cmsService.getById(model.getId());
         if (cms == null) {
             throw new YamiShopBindException("参数错误!");
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/ExchangeApplyOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/ExchangeApplyOrderController.java
index c4f09ee..eed646d 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/ExchangeApplyOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/ExchangeApplyOrderController.java
@@ -158,9 +158,9 @@
         if (Double.valueOf(money_revise).doubleValue() <= 0) {
             throw new YamiShopBindException("账变金额不能小于等于0");
         }
-        if (StringUtils.isNullOrEmpty(login_safeword)) {
+        /*if (StringUtils.isNullOrEmpty(login_safeword)) {
             throw new YamiShopBindException("请输入资金密码");
-        }
+        }*/
         if (StringUtils.isNullOrEmpty(reset_type)) {
             throw new YamiShopBindException("请选择转移方向");
         }
@@ -184,7 +184,7 @@
             if (!StringUtils.isNullOrEmpty(error)) {
                 throw new YamiShopBindException(error);
             }
-            sysUserService.checkSafeWord(model.getLoginSafeword());
+            //sysUserService.checkSafeWord(model.getLoginSafeword());
             if (!LockFilter.add(model.getId())) {
                 throw new YamiShopBindException("请稍后再试");
             }
@@ -222,7 +222,7 @@
             if (!StringUtils.isNullOrEmpty(error)) {
                 throw new YamiShopBindException(error);
             }
-            sysUserService.checkSafeWord(lockModel.getLoginSafeword());
+            //sysUserService.checkSafeWord(lockModel.getLoginSafeword());
             if (!LockFilter.add(lockModel.getId())) {
                 throw new YamiShopBindException("请稍后再试");
             }
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserAllRecomController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserAllRecomController.java
index 81599e7..8da4443 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserAllRecomController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserAllRecomController.java
@@ -68,11 +68,11 @@
     @PostMapping("update")
     @ApiOperation("修改推荐关系")
     public Result<Page<UserRecomDto>> update(@Valid @RequestBody UserAllRecomUpdateModel model) {
-        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
+        /*model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
         SysUser sysUser = sysUserService.getSysUserById( SecurityUtils.getSysUser().getUserId());
         if(!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
             throw new YamiShopBindException("资金密码不正确!");
-        }
+        }*/
         userRecomService.updateAllRecom(model.getUserCode(),model.getUserId());
         return Result.ok(null);
     }
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
index c2e2f2e..953c1a1 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
@@ -121,7 +121,7 @@
         }
         boolean lock = false;
 
-        sysUserService.checkSafeWord(login_safeword);
+        //sysUserService.checkSafeWord(login_safeword);
         SysUser sysUser= sysUserService.getSysUserById( SecurityUtils.getSysUser().getUserId());
         try {
             String error = this.verificationReset(moneyRevise, reset_type, coin_type, login_safeword);
@@ -167,9 +167,9 @@
             throw new BusinessException("账变金额不能小于等于0");
         }
 
-        if (StringUtils.isNullOrEmpty(login_safeword)) {
+        /*if (StringUtils.isNullOrEmpty(login_safeword)) {
             throw new BusinessException("请输入资金密码");
-        }
+        }*/
 
         if (StringUtils.isNullOrEmpty(reset_type)) {
             throw new BusinessException("请选择账变类型");
@@ -188,7 +188,7 @@
     @PostMapping("updateWallt")
     @SysLog("修改账户余额")
     public Result updateWallt(@Valid @RequestBody UpdateWalltModel model) {
-        sysUserService.checkSafeWord(model.getSafePassword());
+        //sysUserService.checkSafeWord(model.getSafePassword());
 
 
 
@@ -243,7 +243,7 @@
 //        if (!sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()))){
 //            throw new YamiShopBindException("谷歌验证码错误");
 //        }
-        sysUserService.checkSafeWord(model.getLoginSafeword());
+        //sysUserService.checkSafeWord(model.getLoginSafeword());
         userService.restLoginPasswrod(model.getUserId(), passwordManager.decryptPassword(model.getPassword()));
         User user= userService.getById(model.getUserId());
         Log log = new Log();
@@ -280,7 +280,7 @@
 //        if (!sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()))){
 //            throw new YamiShopBindException("登录人谷歌验证码错误");
 //        }
-        sysUserService.checkSafeWord(model.getLoginSafeword());
+        //sysUserService.checkSafeWord(model.getLoginSafeword());
         userService.restSafePassword(model.getUserId(), passwordManager.decryptPassword(model.getNewSafeword()));
         User user= userService.getById(model.getUserId());
         Log log = new Log();
@@ -300,10 +300,10 @@
     @ApiOperation(value = "强制用户退出登录状态")
     public Result resetUserLoginState(@Valid @RequestBody ResetUserLoginStateModel model) {
         try {
-            if (!sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()))){
+            /*if (!sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()))){
                 throw new YamiShopBindException("谷歌验证码错误");
-            }
-            sysUserService.checkSafeWord(model.getLoginSafeword());
+            }*/
+            //sysUserService.checkSafeWord(model.getLoginSafeword());
             tokenStore.deleteAllToken(String.valueOf(SysTypeEnum.ORDINARY.value()), String.valueOf(model.getUserId()));
              User user=userService.getById(model.getUserId());
             Log log = new Log();

--
Gitblit v1.9.3