Merge branch 'feature/xgh/20241月迭代' into 'master'

Feature/xgh/20241月迭代

See merge request !1638

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ExternalUserDTO.java

@@ -37,7 +37,17 @@ public class ExternalUserDTO implements Serializable{
 
     private String state;
 
-    public Integer getFriendType() {
+	private Integer addWay ;
+
+	public Integer getAddWay() {
+		return addWay;
+	}
+
+	public void setAddWay(Integer addWay) {
+		this.addWay = addWay;
+	}
+
+	public Integer getFriendType() {
         return friendType;
     }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MemberUnionidRelatedDTO.java

@@ -48,6 +48,16 @@ public class MemberUnionidRelatedDTO implements Serializable{
     // 是否从自建应用下的回调
     private int selfCallback = 0;
 
+    private Integer addWay ;
+
+    public Integer getAddWay() {
+        return addWay;
+    }
+
+    public void setAddWay(Integer addWay) {
+        this.addWay = addWay;
+    }
+
     public int getSelfCallback() {
         return selfCallback;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/WxUserAddLogQDTO.java

@@ -19,6 +19,15 @@ public class WxUserAddLogQDTO implements Serializable{
     private String staffId;
     private String staffName;
     private String clerkId;
+    private Integer addWay ;
+
+    public Integer getAddWay() {
+        return addWay;
+    }
+
+    public void setAddWay(Integer addWay) {
+        this.addWay = addWay;
+    }
 
     public boolean isDelClerkFlag() {
         return delClerkFlag;

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

@@ -385,7 +385,10 @@ public interface TabHaobanExternalClerkRelatedMapper {
     List<String> listByClerkId(@Param("staffId")String staffId, @Param("clerkId")String clerkId) ;
     
     int updateExternalStatus(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("externalUserid")String externalUserid, @Param("status")int status);
-    
+
+    int updateExternalStatusById(@Param("id")String id,  @Param("status")int status);
+
+
     /**
      * 通过第三方或者待开发查询是否好友
      */

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanExternalClerkRelated.java

@@ -49,6 +49,16 @@ public class TabHaobanExternalClerkRelated implements Serializable {
      */
     private Long addTime;
 
+    private Integer externalStatus ;
+
+    public Integer getExternalStatus() {
+        return externalStatus;
+    }
+
+    public void setExternalStatus(Integer externalStatus) {
+        this.externalStatus = externalStatus;
+    }
+
     public Long getAddTime() {
         return addTime;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/ExternalUserPojo.java

@@ -24,6 +24,17 @@ public class ExternalUserPojo implements Serializable{
 	private Integer friendType;
 	private String state;
 
+	// https://developer.work.weixin.qq.com/document/path/92265#%E6%9D%A5%E6%BA%90%E5%AE%9A%E4%B9%89
+	private int addWay ;
+
+	public int getAddWay() {
+		return addWay;
+	}
+
+	public void setAddWay(int addWay) {
+		this.addWay = addWay;
+	}
+
 	public Integer getFriendType() {
 		return friendType;
 	}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WxUserAddLogServiceImpl.java

@@ -87,6 +87,9 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
                     entity.setAllDelFlag(this.isAllDel(externalUserid));
                 }
             }
+            if(null != qdto.getAddWay() && qdto.getAddWay().equals(202)) {
+                entity.setAddChannel(3);
+            }
             // 新增好友
             if (!qdto.isDelFlag()) {
                 String memberLabelId = null;

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

@@ -242,6 +242,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return;
         }
         TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedList.get(0);
+        this.externalClerkRelatedMapper.updateExternalStatusById(related.getExternalClerkRelatedId(),3) ;
         String enterpriseId = related.getEnterpriseId();
         //添加日志
         WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
@@ -653,6 +654,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
        wxUserAddLogQDTO.setStaffId(staffId);
        wxUserAddLogQDTO.setStaffName(staffName);
        wxUserAddLogQDTO.setClerkId(hyClerkId);
+       wxUserAddLogQDTO.setAddWay(dto.getAddWay());
        this.wxUserAddLogService.save(wxUserAddLogQDTO);
        if(StringUtils.isNotBlank(memberId)) {
            this.groupChatService.matchGicMember(wxEnterpriseId, enterpriseId, memberId, externalUserId);
@@ -797,8 +799,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             if(exsitDTO.getStatusFlag()==1) {
                 if(StringUtils.isEmpty(exsitDTO.getSelfExternalUserid())) {
                     exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserid());
+                    exsitDTO.setExternalStatus(1);
                     this.externalClerkRelatedService.update(exsitDTO);
                 }
+                this.externalClerkRelatedMapper.updateExternalStatusById(exsitDTO.getExternalClerkRelatedId(),1) ;
                 return ;
             }
             exsitDTO.setMemberUnionidRelatedId(memberUnionidRelatedId);
@@ -815,6 +819,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             if(StringUtils.isNotBlank(exsitDTO.getMemberId()) && exsitDTO.getStatusFlag() != 1) {
                 exsitDTO.setStatusFlag(1);
             }
+            exsitDTO.setExternalStatus(1);
             this.externalClerkRelatedService.update(exsitDTO);
         }
     }
@@ -994,7 +999,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         dto.setAvatar(StringUtils.isBlank(dto.getAvatar()) ? cacheDTO.getAvatar() : dto.getAvatar());
         dto.setExternalUserid(StringUtils.isBlank(dto.getExternalUserid()) ? cacheDTO.getExternalUserid() : externalUserid);
         dto.setSelfExternalUserid(StringUtils.isBlank(dto.getSelfExternalUserid()) ? cacheDTO.getSelfExternalUserid() : dto.getSelfExternalUserid());
-
+        dto.setAddWay(externalUserDTO.getAddWay());
         if (StringUtils.isAnyBlank(dto.getExternalUserid(), dto.getSelfExternalUserid())) {
             log.error("新增外部联系人,只有一个外部联系人id,wxEnterpriseId：{}", wxEnterpriseId, dto.getExternalUserid());
             return null;
@@ -1397,6 +1402,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String avatar = "";
         Integer friendType = 1;
         String state = "";
+        Integer addWay = 0 ;
         if (StringUtils.isNotBlank(uJ)) {
             JSONObject jo = JSON.parseObject(uJ);
             String external_contact = jo.getString("external_contact");
@@ -1424,6 +1430,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                         if (jt != null) {
                             externalUserId = jt.getString("external_userid");
                             createTime = follow.getString("createtime");
+                            addWay = follow.getIntValue("add_way") ;
                             break;
                         }
                     }
@@ -1438,6 +1445,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         pojo.setAvatar(avatar);
         pojo.setFriendType(friendType);
         pojo.setState(state);
+        pojo.setAddWay(addWay);
         return EntityUtil.changeEntityByJSON(ExternalUserDTO.class, pojo);
     }
 

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

@@ -442,9 +442,21 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         Long hmGroupId = hmQrcodeQDTO.getHmGroupId();
         Long hmGroupIdOld = hmOld.getHmGroupId();
         if (!hmGroupId.equals(hmGroupIdOld)) {
-            HmGroupSettingBO hmGroupSettingBOOld = hmGroupService.queryGroupSettingDetail(hmGroupIdOld);
-            HmGroupSettingBO hmGroupSettingBO = hmGroupService.queryGroupSettingDetail(hmGroupId);
-            logContent.append("活码分组「").append(hmGroupSettingBOOld.getGroupName()).append("」").append("变更为「").append(hmGroupSettingBO.getGroupName()).append("」");
+            String  oldName = "默认分组";
+            if(hmGroupIdOld != 0) {
+                HmGroupSettingBO hmGroupSettingBOOld = hmGroupService.queryGroupSettingDetail(hmGroupIdOld);
+                if(null != hmGroupSettingBOOld) {
+                    oldName = hmGroupSettingBOOld.getGroupName();
+                }
+            }
+            String newName = "默认分组" ;
+            if(hmGroupId != 0) {
+                HmGroupSettingBO hmGroupSettingBO = hmGroupService.queryGroupSettingDetail(hmGroupId);
+                if(null != hmGroupSettingBO) {
+                    newName = hmGroupSettingBO.getGroupName() ;
+                }
+            }
+            logContent.append("活码分组「").append(oldName).append("」").append("变更为「").append(newName).append("」");
         }
         //员工变更
         List<String> clerkIdList = hmQrcodeQDTO.getClerkIdList();

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

@@ -21,12 +21,13 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
         <result column="self_external_userid" property="selfExternalUserid"/>
         <result column="add_time" property="addTime" jdbcType="INTEGER"/>
+        <result column="external_status" property="externalStatus" />
     </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 ,self_external_userid,add_time
+      relation_key, status_flag, create_time, update_time,external_user_id ,self_external_userid,add_time , external_status
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
@@ -218,6 +219,9 @@
             <if test="addTime != null">
                 add_time = #{addTime,jdbcType=INTEGER},
             </if>
+            <if test="null != externalStatus">
+                external_status = #{externalStatus} ,
+            </if>
         </set>
         where external_clerk_related_id = #{externalClerkRelatedId,jdbcType=VARCHAR}
     </update>
@@ -798,6 +802,11 @@
 		update tab_haoban_external_clerk_related set external_status = #{status} where 
 		external_user_id = #{externalUserid} and wx_enterprise_id = #{wxEnterpriseId}
 	</update>
+
+    <update id="updateExternalStatusById">
+        update tab_haoban_external_clerk_related set external_status = #{status} , update_time=now() where
+            external_clerk_related_id = #{id}
+    </update>
 	
 	<select id="getMemberForExternalId"  resultMap="BaseResultMap">
            select <include refid="Base_Column_List"/>