From 830bbe81833bafd79a844eb9e86da864b9e97544 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Wed, 3 Sep 2025 18:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=81=BF=E6=9C=BA=E5=88=B6=20fix=20bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/account/controller/LoginController.java      |  8 --------
 .../controller/admin/AccountUserBaseController.java   |  2 +-
 .../service/impl/AccountUserBaseServiceImpl.java      | 11 ++---------
 .../mall/account/service/impl/AsyncTaskService.java   |  4 ++--
 .../controller/admin/ShopMchEntryAdminController.java |  2 +-
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java
index f733edca..abdfb89f 100644
--- a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java
+++ b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java
@@ -106,14 +106,6 @@ public class LoginController extends BaseControllerImpl {
         return geTuiPushService.pushMessageToCid("d4df466ea274314ec1025bafa0043f8b", title, paramsJSON.getStr("message"), clickType, clinkContent);
     }
 
-    @RequestMapping(value = "/testcase", method = RequestMethod.GET)
-    public Object testcase() {
-        Map<String, Object> arg = new HashMap<String, Object>();
-        arg.put("password", "HzMk23");
-
-        return accountUserBaseService.sendSmsMessage("", "SMS_481085172", arg);
-    }
-
     @ApiOperation(value = "登录以后返回token")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "user_account", value = "账号", paramType = "query", required = false, dataType = "String"),
diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java
index cd3ba870..39838857 100644
--- a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java
+++ b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java
@@ -193,7 +193,7 @@ public class AccountUserBaseController extends BaseControllerImpl {
                 params.put("password", "");
                 params.put("user_mobile", userMobile);
                 params.put("is_merch", "1"); // 是否为商家入驻 1-是；其他-否
-                params.put("user_is_admin", "2"); // //user_is_admin 用户类型：0-普通用户；1-管理员；2-入驻商户；默认是普通用户
+                params.put("user_is_admin", CommonConstant.USER_TYPE_MCH.toString()); // //user_is_admin 用户类型：0-普通用户；1-管理员；2-入驻商户；默认是普通用户
 
                 if (StrUtil.isNotBlank(cid)) {
                     params.put("cid", cid); // 个推客户端Id
diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
index 95a0e1c3..2f516df1 100644
--- a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
+++ b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
@@ -218,7 +218,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
 
         //user_is_admin 用户类型：0-普通用户；1-管理员；2-入驻商户；默认是普通用户
         if (StrUtil.isNotBlank(params.get("user_mobile"))
-                && CommonConstant.USER_TYPE_MCH.equals(params.get("user_is_admin"))) {
+                && CommonConstant.USER_TYPE_MCH.toString().equals(params.get("user_is_admin"))) {
             // 商家版app，显示申请入驻的状态
 
             String userMobile = params.get("user_mobile");
@@ -2994,13 +2994,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
 
         // 找出手机对应的绑定用户
         // 是否为手机号注册，密码6位随机数
-        CommonResult result = doMobileBindLogin(verifyMobile, CommonConstant.USER_TYPE_MCH, cid, osType);
-        if (result.getStatus() == 200L) {
-            // 登录成功之后，异步检查并修复商户店铺信息
-            asyncTaskService.checkAndFixMchStoreInfo(PhoneNumberUtils.cleanPhoneNumber(user_mobile));
-        }
-
-        return result;
+        return doMobileBindLogin(verifyMobile, CommonConstant.USER_TYPE_MCH, cid, osType);
     }
 
     /**
@@ -3234,7 +3228,6 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
 
         // 检查输入字符是不是包含 sql 注入特征，如果包含不给以通过
         if (!CommonService.isValidInput(user_mobile, cid, osType)) {
-            // new ApiException(ResultCode.VALIDATE_INPUTS);
             return CommonResult.failed(ResultCode.VALIDATE_INPUTS);
         }
 
diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AsyncTaskService.java b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AsyncTaskService.java
index fc9fa067..ebe47663 100644
--- a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AsyncTaskService.java
+++ b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AsyncTaskService.java
@@ -31,11 +31,11 @@ public class AsyncTaskService {
     @Async
     public Boolean checkAndFixMchStoreInfo(String loginMobile) {
         try {
-            logger.info("开始检查并修复商户店铺信息，手机号: {}", loginMobile);
+            logger.debug("开始检查并修复商户店铺信息，手机号: {}", loginMobile);
             // 调用shop服务检查并修复商户店铺信息
             Boolean result = shopService.checkAndFixMchStoreInfo(loginMobile);
             // 记录处理结果日志
-            logger.info("商户店铺信息检查与修复完成，手机号: {}，结果: {}", loginMobile, result);
+            logger.debug("商户店铺信息检查与修复完成，手机号: {}，结果: {}", loginMobile, result);
             return result;
         } catch (Exception e) {
             // 捕获所有异常，防止影响主流程
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java
index e177894e..324299ed 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 
 @Slf4j
-@Api(tags = "店铺基础信息表")
+@Api(tags = "商家入驻业务控制器")
 @RestController
 @RequestMapping("/admin/shop/merch")
 public class ShopMchEntryAdminController extends BaseControllerImpl {