Browse Source

[mallUser修改][修改]:用户可修改昵称,手机号,如果手机号改变,清除绑定的微信登录及B端数据塔台

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
bf7f6f006a
5 changed files with 40 additions and 2 deletions
  1. +11
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java
  4. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java
  5. +15
    -0
      mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml

+ 11
- 2
mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java View File

@@ -148,6 +148,7 @@ public class MallUserInfoController extends BaseController {
@SystemControllerLog(description = "用户管理-修改用户") @SystemControllerLog(description = "用户管理-修改用户")
public ResultData updateUser(@RequestBody MallUserInfo userInfo) { public ResultData updateUser(@RequestBody MallUserInfo userInfo) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::updateUser"); logger.debug("[" + getIpAddr() + "] MallUserInfoController::updateUser");
boolean bChangedPhone = false;
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
// 只有超管和自己能更新信息 // 只有超管和自己能更新信息
if (!(currentUser.getId().equals(userInfo.getId()) || if (!(currentUser.getId().equals(userInfo.getId()) ||
@@ -164,6 +165,7 @@ public class MallUserInfoController extends BaseController {
if(checkUniquePhone(userInfo.getPhone()) > 0){ if(checkUniquePhone(userInfo.getPhone()) > 0){
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在"); return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(),"手机号已存在");
} }
bChangedPhone = true;
} }


userInfo.setTenantId(getTenantId()); userInfo.setTenantId(getTenantId());
@@ -190,8 +192,11 @@ public class MallUserInfoController extends BaseController {
if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) {
adminUser.setPassword(userInfo.getPassword()); adminUser.setPassword(userInfo.getPassword());
} }
if (StringUtils.isNotBlank(userInfo.getUsername())) {
adminUser.setUsername(userInfo.getUsername());
if (StringUtils.isNotBlank(userInfo.getNickName())) {
adminUser.setNickName(userInfo.getNickName());
}
if (StringUtils.isNotBlank(userInfo.getPhone())) {
adminUser.setPhone(userInfo.getPhone());
} }
userInfoService.saveOrUpdate(adminUser); userInfoService.saveOrUpdate(adminUser);
} else { } else {
@@ -204,6 +209,10 @@ public class MallUserInfoController extends BaseController {
userRoleService.saveOrUpdate(r); userRoleService.saveOrUpdate(r);
} }
} }
if(bChangedPhone) {
// 手机号修改,清除bopen_id, 清除web_open_id
userInfoService.cleanAllOpenId(userInfo);
}


return new ResultData(); return new ResultData();
} }


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java View File

@@ -24,6 +24,8 @@ public interface MallUserInfoMapper extends CommonMapper<MallUserInfo, String> {


void removeWebOpenId(MallUserInfo mallUserInfo); void removeWebOpenId(MallUserInfo mallUserInfo);


void removeAllOpenId(MallUserInfo mallUserInfo);

MallUserInfo selectByPhone(@Param("phone") String phone, @Param("tenantId") String tenantId); MallUserInfo selectByPhone(@Param("phone") String phone, @Param("tenantId") String tenantId);
Integer hasButtonPermission(@Param("userId") Long userId, @Param("permission") String permission); Integer hasButtonPermission(@Param("userId") Long userId, @Param("permission") String permission);


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java View File

@@ -143,6 +143,8 @@ public interface MallUserInfoService {


void cleanWebOpenId(MallUserInfo user); void cleanWebOpenId(MallUserInfo user);


void cleanAllOpenId(MallUserInfo user);

/** /**
* 根据条件用户列表 * 根据条件用户列表
* @return * @return


+ 10
- 0
mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java View File

@@ -113,6 +113,16 @@ public class MallUserInfoServiceImpl implements MallUserInfoService {
mallUserInfoMapper.removeWebOpenId(updateUser); mallUserInfoMapper.removeWebOpenId(updateUser);
} }



@Override
public void cleanAllOpenId(MallUserInfo user) {
MallUserInfo updateUser = new MallUserInfo();
updateUser.setId(user.getId());
updateUser.setTenantId(user.getTenantId());
updateUser.setUsername(user.getUsername());
mallUserInfoMapper.removeAllOpenId(updateUser);
}

@Override @Override
public void saveOrUpdate(MallUserInfo record) { public void saveOrUpdate(MallUserInfo record) {
if(StringUtils.isBlank(record.getFlowPermission())){ if(StringUtils.isBlank(record.getFlowPermission())){


+ 15
- 0
mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml View File

@@ -173,6 +173,21 @@
</if> </if>
</update> </update>


<update id="removeAllOpenId" >
update mall_user_info
set `web_open_id` = null, `bopen_id` = null
where 1=1
<if test=" null != tenantId ">
and `tenant_id`=#{tenantId}
</if>
<if test=" null != username ">
and username=#{username}
</if>
<if test=" null != id ">
and `id` = #{id}
</if>
</update>

<select id="selectByPhone" resultMap="BaseResultMap"> <select id="selectByPhone" resultMap="BaseResultMap">
select select
<include refid="allColumns"/> <include refid="allColumns"/>


Loading…
Cancel
Save