外部联系人变更通知会员修改状态

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

@@ -420,4 +420,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
      */
     void deleteByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseIdList") List<String> enterpriseIdList);
 
+    List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(@Param("memberId") String memberId, @Param("enterpriseId") String enterpriseId);
+
 }
\ No newline at end of file

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

@@ -112,5 +112,6 @@ public interface ExternalClerkRelatedService {
 	 * @param enterpriseIdList
 	 */
 	void deleteByWxEnterpriseId(String wxEnterpriseId,List<String> enterpriseIdList);
+	List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(String memberId, String enterpriseId);
 
 }

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

@@ -176,7 +176,11 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
         }
         MemberDataDTO memberDataDTO = memberObj.toJavaObject(MemberDataDTO.class);
         entity.setMemberId(memberId);
-        entity.setMemberName(memberDataDTO.getName());
+        String name = memberDataDTO.getName();
+        if (name != null && name.length()>32){
+            name = name.substring(0, 32);
+        }
+        entity.setMemberName(name);
         entity.setMemberNick(memberDataDTO.getNickName());
         entity.setMemberImage(memberDataDTO.getPhotoUrl());
         entity.setMemberPhone(memberDataDTO.getPhoneNumber());

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

@@ -126,8 +126,19 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                 String memberId = externalClerkRelated.getMemberId();
                 logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);
                 memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
-                // todo 查询好办外部联系人接口，获取最早的时间替换当前时间
-                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
+                // 查询好办外部联系人接口,获取最近删除的时间
+                List<TabHaobanExternalClerkRelated> memberList = this.getAddTimeByMemberId(memberId, enterpriseId);
+                Date date = new Date();
+                Date opTime = new Date(0);
+                if (CollectionUtils.isNotEmpty(memberList)){
+                    for (TabHaobanExternalClerkRelated a : memberList){
+                        if ((a.getStatusFlag() == 0 || a.getStatusFlag() == 2) && a.getUpdateTime().after(opTime)){
+                            opTime= a.getUpdateTime();
+                            date = opTime;
+                        }
+                    }
+                }
+                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, date,null);
             }
         } else {
             //删除后 每次回调会员
@@ -531,4 +542,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     public void deleteByWxEnterpriseId(String wxEnterpriseId, List<String> enterpriseIdList) {
         this.mapper.deleteByWxEnterpriseId(wxEnterpriseId,enterpriseIdList);
     }
+
+    @Override
+    public List<TabHaobanExternalClerkRelated> getAddTimeByMemberId(String memberId, String enterpriseId) {
+        return this.mapper.getAddTimeByMemberId(memberId,enterpriseId);
+    }
 }

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

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.gic.haoban.manage.service.entity.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -40,10 +41,6 @@ import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
-import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
-import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
-import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
 import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
@@ -224,7 +221,19 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             if (count == 0) {
                 logger.info("通知会员 删除企微好友,该会员无任何好友关系，memberId:{}", memberId);
                 memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
-                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, new Date());
+                // 查询好办外部联系人接口,获取最近删除的时间
+                List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId);
+                Date date = new Date();
+                Date opTime = new Date(0);
+                if (CollectionUtils.isNotEmpty(memberList)){
+                    for (TabHaobanExternalClerkRelated a : memberList){
+                        if ((a.getStatusFlag() == 0 || a.getStatusFlag() == 2) && a.getUpdateTime().after(opTime)){
+                            opTime= a.getUpdateTime();
+                            date = opTime;
+                        }
+                    }
+                }
+                memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 0, date,null);
                 continue;
             }
             //logger.info("通知会员 删除企微好友 每次调用更新为非企微好友时间 memberId：{}", memberId);

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

@@ -735,7 +735,23 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //回调给会员，更新是否为企微好友
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
         this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
-        this.memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, new Date());
+        // 查询好办外部联系人接口，获取最早的时间替换当前时间
+        List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId);
+        Date date = new Date();
+        Date opTime = new Date(0);
+        Date firstTime = new Date();
+        if (CollectionUtils.isNotEmpty(memberList)){
+            for (TabHaobanExternalClerkRelated a : memberList){
+                if ((a.getStatusFlag() == 1 || a.getStatusFlag() == 3 || a.getStatusFlag() == 4) && opTime.before(new Date(a.getAddTime()))){
+                    opTime= new Date(a.getAddTime());
+                    date = opTime;
+                }
+                if (firstTime.after(new Date(a.getAddTime()))){
+                    firstTime = new Date(a.getAddTime());
+                }
+            }
+        }
+        this.memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, date,firstTime);
         //定制事件订阅
         addDelFriendEvent(unionId, clerkId, wxEnterpriseId, enterpriseId, memberId, storeId, 1);
         return memberId;

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

@@ -849,5 +849,14 @@
         AND status_flag = 1
         AND external_user_id IS NULL
     </update>
+    <select id="getAddTimeByMemberId"  resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+            tab_haoban_external_clerk_related
+        WHERE
+            member_id = #{memberId}
+          AND enterprise_id = #{enterpriseId}
+    </select>
 
 </mapper>
\ No newline at end of file