修改代码

pz-common/src/main/java/com/pz/common/enums/UserType.java

@@ -25,7 +25,12 @@ public enum UserType {
     APP_USER("app_user"),
     APP_USER("app_user"),
 
 
     /**
     /**
-     * 商家端
+     * 商城商户
+     */
+    STORE_AMERCHANT_USER("store_merchant_user"),
+
+    /**
+     * 商城商户
      */
      */
     AMERCHANT_USER("merchant_user");
     AMERCHANT_USER("merchant_user");
 
 

pz-system/src/main/java/com/pz/system/service/SysLoginService.java

@@ -271,7 +271,7 @@ public class SysLoginService {
         SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
         SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
             .select(SysUser::getUserName, SysUser::getStatus)
             .select(SysUser::getUserName, SysUser::getStatus)
             .eq(SysUser::getUserName, username)
             .eq(SysUser::getUserName, username)
-            .eq(SysUser::getUserType, UserType.SYS_USER.getUserType()).or().eq(SysUser::getUserType, UserType.AMERCHANT_USER.getUserType()));
+            .eq(SysUser::getUserType, UserType.SYS_USER.getUserType()).or().eq(SysUser::getUserType, UserType.STORE_AMERCHANT_USER.getUserType()));
         if (ObjectUtil.isNull(user)) {
         if (ObjectUtil.isNull(user)) {
             log.info("登录用户：{} 不存在.", username);
             log.info("登录用户：{} 不存在.", username);
             throw new UserException("user.not.exists", username);
             throw new UserException("user.not.exists", username);

pz-system/src/main/java/com/pz/system/service/impl/StoreApplyServiceImpl.java

@@ -153,7 +153,7 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
                     sysUser.setUserName(storeApply.getTel());
                     sysUser.setUserName(storeApply.getTel());
                     sysUser.setNickName(storeApply.getName());
                     sysUser.setNickName(storeApply.getName());
                     sysUser.setEmail(storeApply.getEmail());
                     sysUser.setEmail(storeApply.getEmail());
-                    sysUser.setUserType(UserType.AMERCHANT_USER.getUserType());
+                    sysUser.setUserType(UserType.STORE_AMERCHANT_USER.getUserType());
                     sysUser.setPassword(BCrypt.hashpw("123456"));
                     sysUser.setPassword(BCrypt.hashpw("123456"));
 
 
                     sysUserMapper.insert(sysUser);
                     sysUserMapper.insert(sysUser);