在职继承校验

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

@@ -56,6 +56,17 @@ public class MemberUnionidRelatedDTO implements Serializable{
 
     private boolean isFlush = false  ;
 
+    // 删除客户的操作来源，DELETE_BY_TRANSFER表示此客户是因在职继承自动被转接成员删除
+    private int deleteByTransfer = 0 ;
+
+    public int getDeleteByTransfer() {
+        return deleteByTransfer;
+    }
+
+    public void setDeleteByTransfer(int deleteByTransfer) {
+        this.deleteByTransfer = deleteByTransfer;
+    }
+
     public int getRetryTimes() {
         return retryTimes;
     }

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

@@ -29,6 +29,17 @@ public class WxUserAddLogQDTO implements Serializable{
     // 删除时是否单向好友 1是0否
     private int delIsSingle ;
 
+    // 删除客户的操作来源，DELETE_BY_TRANSFER表示此客户是因在职继承自动被转接成员删除
+    private int deleteByTransfer = 0 ;
+
+    public int getDeleteByTransfer() {
+        return deleteByTransfer;
+    }
+
+    public void setDeleteByTransfer(int deleteByTransfer) {
+        this.deleteByTransfer = deleteByTransfer;
+    }
+
     public int getDelIsSingle() {
         return delIsSingle;
     }

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

@@ -147,6 +147,12 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
                 entity.setMemberId(qdto.getMemberId());
                 entity = this.addMemberInfo(qdto.getEnterpriseId(), qdto.getMemberId(), entity);
             }
+            if (qdto.isDelFlag()) {
+                if(qdto.getDeleteByTransfer()==1) {
+                    // 在职继承删除
+                    entity.setAddChannel(4);
+                }
+            }
             entity.setQwAddTime(qdto.getQwAddTime());
             entity.setFriendClerkId(qdto.getFriendClerkId());
             entity.setFriendStoreId(qdto.getFriendStoreId());

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

@@ -173,9 +173,11 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         if(null != related.getAddTime()) {
             wxUserAddLogQDTO.setQwAddTime(related.getAddTime());
         }
+        wxUserAddLogQDTO.setDeleteByTransfer(dto.getDeleteByTransfer());
         wxUserAddLogQDTO.setFriendClerkId(related.getClerkId());
         wxUserAddLogQDTO.setFriendStoreId(related.getStoreId());
         int autoDelNum = this.openQwApiService.getAutoDelNum(staffId,externalUserid) ;
+
         if(autoDelNum>0) {
             wxUserAddLogQDTO.setDelType(1);
         }

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

@@ -191,6 +191,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         int type = externalUserPojo.getType();
         String wxUserId = qwFrientNoticeDTO.getWxUserId();
         MemberUnionidRelatedDTO memberUnionidRelatedDTO = EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class, qwFrientNoticeDTO);
+        if(StringUtils.isNotBlank(qwFrientNoticeDTO.getState()) && "DELETE_BY_TRANSFER".equals(qwFrientNoticeDTO.getState())) {
+            memberUnionidRelatedDTO.setDeleteByTransfer(1);
+        }
         if (type == DealQywxExternalUserPojo.DealType.add.getType()) {
             log.info("新增外部联系人回调开始：{}", params);
             this.addMemberUnionidRelatedNew(memberUnionidRelatedDTO, wxUserId);