Merge remote-tracking branch 'origin/dev' into dev

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

@@ -270,7 +270,8 @@ public class SysLoginService {
     private SysUser loadUserByUsername(String username) {
     private SysUser loadUserByUsername(String username) {
         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.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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pz.common.enums.UserType;
 import com.pz.common.enums.UserType;
+import com.pz.common.exception.ServiceException;
 import com.pz.common.helper.LoginHelper;
 import com.pz.common.helper.LoginHelper;
 import com.pz.system.domain.StoreInfo;
 import com.pz.system.domain.StoreInfo;
 import com.pz.system.domain.SysUserRole;
 import com.pz.system.domain.SysUserRole;
@@ -133,6 +134,7 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
     @Transactional
     @Transactional
     public Boolean updateByBo(StoreApplyBo bo) {
     public Boolean updateByBo(StoreApplyBo bo) {
         StoreApply update = BeanUtil.toBean(bo, StoreApply.class);
         StoreApply update = BeanUtil.toBean(bo, StoreApply.class);
+
         //审核通过
         //审核通过
         if (bo.getStatus() == 1) {
         if (bo.getStatus() == 1) {
             Optional.ofNullable(baseMapper.selectById(bo.getId()))
             Optional.ofNullable(baseMapper.selectById(bo.getId()))
@@ -142,20 +144,19 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
                     //记录至商户表
                     //记录至商户表
                     storeInfoMapper.insert(bean);
                     storeInfoMapper.insert(bean);
 
 
-                    //创建系统用户
-                    SysUser sysUser = new SysUser();
-                    sysUser.setUserName(storeApply.getTel());
-                    sysUser.setNickName(storeApply.getName());
-                    sysUser.setEmail(storeApply.getEmail());
-                    sysUser.setUserType(UserType.AMERCHANT_USER.getUserType());
+                    Optional.ofNullable(sysUserMapper.selectUserByPhonenumber(bo.getTel())).ifPresent(
+                        sysUser -> {
+                            sysUser.setUserType(UserType.STORE_AMERCHANT_USER.getUserType());
                             sysUser.setPassword(BCrypt.hashpw("123456"));
                             sysUser.setPassword(BCrypt.hashpw("123456"));
-
-                    sysUserMapper.insert(sysUser);
+                            sysUserMapper.updateById(sysUser);
 
 
                             SysUserRole sysUserRole = new SysUserRole();
                             SysUserRole sysUserRole = new SysUserRole();
                             sysUserRole.setUserId(sysUser.getUserId());
                             sysUserRole.setUserId(sysUser.getUserId());
-                    sysUserRole.setRoleId(3L);
+                            sysUserRole.setRoleId(5L);
                             sysUserRoleMapper.insert(sysUserRole);
                             sysUserRoleMapper.insert(sysUserRole);
+                        }
+                    );
+
                 });
                 });
         }
         }
         return baseMapper.updateById(update) > 0;
         return baseMapper.updateById(update) > 0;