Merge remote-tracking branch 'origin/master-xgh-好办停用' into developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java

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

@@ -12,12 +12,22 @@ public class WxUserAddLogQDTO implements Serializable{
     private String unionid;
     private Long linkId;
     private Long hmId;
+    // 是否好友删除导购
+    private boolean delClerkFlag;
     private boolean delFlag;
     private String externalUserid;
     private String staffId;
     private String staffName;
     private String clerkId;
 
+    public boolean isDelClerkFlag() {
+        return delClerkFlag;
+    }
+
+    public void setDelClerkFlag(boolean delClerkFlag) {
+        this.delClerkFlag = delClerkFlag;
+    }
+
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }

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

@@ -73,9 +73,13 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
                 }
                 entity = logUser;
                 entity.setLogId(UniqueIdUtils.uniqueLong());
-                entity.setStatusFlag(2);
-                // 是否所有好友删除 1是0否
-                entity.setAllDelFlag(this.isAllDel(externalUserid));
+                if(qdto.isDelClerkFlag()) {
+                    entity.setStatusFlag(3);
+                }else {
+                    entity.setStatusFlag(2);
+                    // 是否所有好友删除 1是0否
+                    entity.setAllDelFlag(this.isAllDel(externalUserid));
+                }
             }
             // 新增好友
             if (!qdto.isDelFlag()) {

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

@@ -335,9 +335,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     @Override
     public void repairExternalUserId(String wxEnterpriseIds) {
         logger.info("外部联系人检查,wxEnterpriseIds={}",wxEnterpriseIds);
-        DingUtils.send("外部联系人修复消息,企业=" + wxEnterpriseIds + ",tranceid=" + ProviderLocalTag.tag.get(), false);
-        if (StringUtils.isEmpty(wxEnterpriseIds)) {
-            return;
+        DingUtils.send("外部联系人修复消息,企业="+wxEnterpriseIds+",tranceid="+ProviderLocalTag.tag.get().traceId, false);
+        if(StringUtils.isEmpty(wxEnterpriseIds)) {
+            return ;
         }
         Object cache = RedisUtil.getCache("repairExternalUserId");
         String[] arr = wxEnterpriseIds.split(",");