Merge branch 'master' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
 import com.github.pagehelper.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 public interface MemberUnionidRelatedMapper {
     int deleteByPrimaryKey(String memberUnionidRelatedId);
@@ -56,7 +54,19 @@ public interface MemberUnionidRelatedMapper {
      * @param selfExternalUserId
      * @return
      */
-    MemberUnionidRelated getBySelfExternalUserId(@Param("wxUserId") String wxUserId,@Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
+    MemberUnionidRelated getBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
 
     List<MemberUnionidRelated> listBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
+
+    /**
+     * 更新外部用户id的老外部用户id
+     *
+     * @param new_external_userid 新的外部标识
+     * @param external_userid     外部用户标识
+     * @param wxEnterpriseId      wx企业标识
+     * @return int
+     * @author mozhu
+     * @date 2021-12-29 16:30:43
+     */
+    int updateExternalUserIdByOldExternalUserId(String new_external_userid, String external_userid, String wxEnterpriseId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -381,7 +381,10 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             for (QywxNewExternalUseridDTO qywxNewExternalUseridDTO : newExternalUseridList) {
                 String new_external_userid = qywxNewExternalUseridDTO.getNew_external_userid();
                 String external_userid = qywxNewExternalUseridDTO.getExternal_userid();
+                //好友关系表
                 tabHaobanExternalClerkRelatedMapper.updateExternalUserIdByOldExternalUserId(new_external_userid, external_userid, wxEnterpriseId);
+                //会员关系表
+                memberUnionidRelatedMapper.updateExternalUserIdByOldExternalUserId(new_external_userid, external_userid, wxEnterpriseId);
                 TabExternalUseridLog tabExternalUseridLog = new TabExternalUseridLog();
                 tabExternalUseridLog.setId(UniqueIdUtils.uniqueLong());
                 tabExternalUseridLog.setOldExternalUserId(external_userid);

haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.xml

@@ -342,4 +342,13 @@
         and wx_user_id = #{wxUserId}
         and self_external_userid = #{selfExternalUserId}
     </select>
+
+    <update id="updateExternalUserIdByOldExternalUserId">
+        UPDATE
+            tab_haoban_member_unionid_related
+        SET external_userid = #{newExternalUserId},
+            update_time     = now()
+        where external_userid = #{oldExternalUserId}
+          and wx_enterprise_id = #{wxEnterpriseId}
+    </update>
 </mapper>
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -227,12 +227,12 @@ public class ClerkController extends WebBaseController {
         }
         Integer agreeExternalUseridFlag = wxEnterpriseDTO.getAgreeExternalUseridFlag();
         int memberOpenCardFlag = enterpriseBindInfo.getMemberOpenCardFlag();
-        if (memberOpenCardFlag == 1 && agreeExternalUseridFlag != null && agreeExternalUseridFlag == 1) {
-            auditSettingVO.setMemberOpenCardFlag(1);
-        } else if (memberOpenCardFlag == 0) {
-            auditSettingVO.setMemberOpenCardFlag(1);
-        } else {
+        boolean agreeExternalUserid = agreeExternalUseridFlag == null || agreeExternalUseridFlag != 1;
+        //同一开平并且未同意转换
+        if (memberOpenCardFlag == 0 && agreeExternalUserid) {
             auditSettingVO.setMemberOpenCardFlag(0);
+        } else {
+            auditSettingVO.setMemberOpenCardFlag(1);
         }
         auditSettingVO.setWxEnterpriseType(enterpriseBindInfo.getWxEnterpriseType());
         auditSettingVO.setFreshFriendFlag(mainStore.getFreshFriendFlag());