Merge branch 'dev/2024/0529/update-app-Y' of feifan/mall-backend-app into master

修改用户信息时,将其它的nickname字段也同时更新

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/mysql/user/MemberUserMapper.java

@@ -10,6 +10,7 @@ import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserPageRe
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -96,4 +97,9 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
         return update(null, lambdaUpdateWrapper);
     }
 
+    void synchronizationUserNicknameForDUser(@Param(value = "nickname")String nickname, @Param(value = "userId")Long userId);
+
+    void synchronizationUserNicknameForIntegral(@Param("nickname") String nickname, @Param("userId") Long userId);
+    void synchronizationUserNicknameForSharePathDesc(@Param("nickname") String nickname, @Param("userId") Long userId);
+    void synchronizationUserNicknameForSharePathAnc(@Param("nickname") String nickname, @Param("userId") Long userId);
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -168,7 +168,13 @@ public class MemberUserServiceImpl implements MemberUserService {
     @Override
     public void updateUser(Long userId, AppMemberUserUpdateReqVO reqVO) {
         MemberUserDO updateObj = BeanUtils.toBean(reqVO, MemberUserDO.class).setId(userId);
-        memberUserMapper.updateById(updateObj);
+        if (memberUserMapper.updateById(updateObj) > 0 && StrUtil.isNotEmpty(reqVO.getNickname())) {
+            //同步修改其它地方保留的用户名
+            memberUserMapper.synchronizationUserNicknameForDUser(reqVO.getNickname(), userId);
+            memberUserMapper.synchronizationUserNicknameForIntegral(reqVO.getNickname(), userId);
+            memberUserMapper.synchronizationUserNicknameForSharePathDesc(reqVO.getNickname(), userId);
+            memberUserMapper.synchronizationUserNicknameForSharePathAnc(reqVO.getNickname(), userId);
+        }
     }
 
     @Override

feifan-module-member/feifan-module-member-biz/src/main/resources/mapper/user/MemberUserMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.newfeifan.mall.module.member.dal.mysql.user.MemberUserMapper">
+
+    <update id="synchronizationUserNicknameForDUser">
+        update distri_duser set nick_name = #{nickname} where user_id = #{userId};
+    </update>
+    <update id="synchronizationUserNicknameForIntegral">
+        update distri_integral set nick_name = #{nickname} where user_id = #{userId};
+    </update>
+    <update id="synchronizationUserNicknameForSharePathDesc">
+        update distri_share_path set desc_nick_name = #{nickname} where descendant = #{userId};
+    </update>
+    <update id="synchronizationUserNicknameForSharePathAnc">
+        update distri_share_path set anc_name = #{nickname} where ancestor = #{userId};
+    </update>
+
+</mapper>

feifan-module-system/feifan-module-system-api/src/main/java/cn/newfeifan/mall/module/system/enums/ErrorCodeConstants.java

@@ -176,6 +176,4 @@ public interface ErrorCodeConstants {
     ErrorCode WECHAT_MSG_TEMPLATE_REDIS_NOT_EXISTS = new ErrorCode(1_002_028_002, "我想消息模板缓存异常");
     ErrorCode CONFIG_NOT_EXISTS = new ErrorCode(1_002_028_003, "系统配置不存在");
     ErrorCode CONFIG_REDIS_NOT_EXISTS = new ErrorCode(1_002_028_004, "系统配置不存在");
-    ErrorCode AUTH_SOCIAL_USER_BIND_MAX = new ErrorCode(1_004_012_004, "此微信号已经到达绑定的上限了");
-
 }

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/social/SocialUserServiceImpl.java

@@ -6,7 +6,6 @@ import cn.newfeifan.mall.framework.common.exception.ServiceException;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.common.util.json.JsonUtils;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.newfeifan.mall.module.system.api.social.SocialUserApi;
 import cn.newfeifan.mall.module.system.api.social.dto.SocialUserBindReqDTO;
 import cn.newfeifan.mall.module.system.api.social.dto.SocialUserRespDTO;
 import cn.newfeifan.mall.module.system.controller.admin.socail.vo.user.SocialUserPageReqVO;
@@ -18,7 +17,6 @@ import cn.newfeifan.mall.module.system.enums.social.SocialTypeEnum;
 import com.alibaba.fastjson.JSONObject;
 import com.xingyuv.jushauth.model.AuthUser;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,10 +55,6 @@ public class SocialUserServiceImpl implements SocialUserService {
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
-    @Resource
-    @Lazy
-    private SocialUserApi socialUserApi;
-
     @Override
     public List<SocialUserDO> getSocialUserList(Long userId, Integer userType) {
         // 获得绑定
@@ -80,11 +74,6 @@ public class SocialUserServiceImpl implements SocialUserService {
                 reqDTO.getCode(), reqDTO.getState());
         Assert.notNull(socialUser, "社交用户不能为空");
 
-        //微信能绑定的账号上限校验
-        if(socialUserApi.wxBindIsMax(socialUser.getId())){
-            throw exception(AUTH_SOCIAL_USER_BIND_MAX);
-        }
-
         // 社交用户可能之前绑定过别的用户，需要进行解绑
 //        socialUserBindMapper.deleteByUserTypeAndSocialUserId(reqDTO.getUserType(), socialUser.getId());