修改代码

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

@@ -134,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()))
@@ -145,23 +146,17 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
 
 
                     Optional.ofNullable(sysUserMapper.selectUserByPhonenumber(bo.getTel())).ifPresent(
                     Optional.ofNullable(sysUserMapper.selectUserByPhonenumber(bo.getTel())).ifPresent(
                         sysUser -> {
                         sysUser -> {
-                            throw new ServiceException("手机号已存在，请更换！");
+                            sysUser.setUserType(UserType.STORE_AMERCHANT_USER.getUserType());
+                            sysUser.setPassword(BCrypt.hashpw("123456"));
+                            sysUserMapper.updateById(sysUser);
+
+                            SysUserRole sysUserRole = new SysUserRole();
+                            sysUserRole.setUserId(sysUser.getUserId());
+                            sysUserRole.setRoleId(5L);
+                            sysUserRoleMapper.insert(sysUserRole);
                         }
                         }
                     );
                     );
-                    //创建系统用户
-                    SysUser sysUser = new SysUser();
-                    sysUser.setUserName(storeApply.getTel());
-                    sysUser.setNickName(storeApply.getName());
-                    sysUser.setEmail(storeApply.getEmail());
-                    sysUser.setUserType(UserType.STORE_AMERCHANT_USER.getUserType());
-                    sysUser.setPassword(BCrypt.hashpw("123456"));
-
-                    sysUserMapper.insert(sysUser);
-
-                    SysUserRole sysUserRole = new SysUserRole();
-                    sysUserRole.setUserId(sysUser.getUserId());
-                    sysUserRole.setRoleId(3L);
-                    sysUserRoleMapper.insert(sysUserRole);
+
                 });
                 });
         }
         }
         return baseMapper.updateById(update) > 0;
         return baseMapper.updateById(update) > 0;