Merge branch 'bugfix/2023-06-16' into 'master'

Bugfix/2023 06 16

See merge request !1325

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -310,8 +310,8 @@ public class GroupChatServiceImpl implements GroupChatService {
                         this.updateGroupChatDetail(qwDTO, groupChatId, false);
                     }
                     if (type == 2) {
-                        this.updateChatStatus(qwDTO, groupChatId);
                         this.updateGroupChatDetail(qwDTO, groupChatId, false);
+                        this.updateChatStatus(qwDTO, groupChatId);
                     }
                     if (type == 3) {
                         this.updateGroupChatDetail(qwDTO, groupChatId, true);
@@ -1100,7 +1100,7 @@ public class GroupChatServiceImpl implements GroupChatService {
         List<String> wxChatIdList = list.stream().map(dto -> dto.getWxChatId()).collect(Collectors.toList());
         ServiceResponse<List<FailChatListDTO>> resp =  this.qywxChatApiService.transfer(qwDTO.getThirdCorpid(),
                 qwDTO.getSelf3thSecret(), wxChatIdList, userid,qwDTO.isSelf(),qwDTO.getUrlHost());
-        logger.info("群继承,继承人={}", JSON.toJSONString(resp), userid);
+        logger.info("群继承,继承人={},{}", JSON.toJSONString(resp), userid);
         if (!resp.isSuccess()) {
             return ServiceResponse.failure("9999", resp.getMessage());
         } else {

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

@@ -779,6 +779,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             TabHaobanExternalClerkRelated exsitDTO = externalList.get(0);
             log.info("更新好友表,{},{}",exsitDTO.getExternalUserId(),exsitDTO.getStatusFlag());
             if(exsitDTO.getStatusFlag()==1) {
+                if(StringUtils.isEmpty(exsitDTO.getSelfExternalUserid())) {
+                    exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserid());
+                    this.externalClerkRelatedService.update(exsitDTO);
+                }
                 return ;
             }
             exsitDTO.setMemberUnionidRelatedId(memberUnionidRelatedId);
@@ -789,6 +793,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setStoreId(storeId);
             exsitDTO.setClerkId(clerkId);
             exsitDTO.setEnterpriseId(enterpriseId);
+            if(StringUtils.isNotEmpty(dto.getSelfExternalUserid())) {
+                exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserid());
+            }
             if(StringUtils.isNotBlank(exsitDTO.getMemberId()) && exsitDTO.getStatusFlag() != 1) {
                 exsitDTO.setStatusFlag(1);
             }

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

@@ -19,12 +19,13 @@
         <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="self_external_userid" property="selfExternalUserid"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         external_clerk_related_id, wx_enterprise_id, enterprise_id, store_id, member_id,
       unionid, head_url,external_name, add_create_time, member_unionid_related_id, clerk_id, staff_id,
-      relation_key, status_flag, create_time, update_time,external_user_id
+      relation_key, status_flag, create_time, update_time,external_user_id ,self_external_userid
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
@@ -183,6 +184,9 @@
             <if test="externalUserId != null">
                 external_user_id = #{externalUserId,jdbcType=VARCHAR},
             </if>
+            <if test="selfExternalUserid != null">
+                self_external_userid = #{selfExternalUserid} ,
+            </if>
             <if test="addCreateTime != null">
                 add_create_time = #{addCreateTime,jdbcType=VARCHAR},
             </if>