时间戳问题处理

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

@@ -125,7 +125,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
             for (TabHaobanExternalClerkRelated externalClerkRelated : haobanExternalClerkRelatedList) {
                 String memberId = externalClerkRelated.getMemberId();
                 logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);
-                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
+//                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
                 // 查询好办外部联系人接口,获取最近删除的时间
                 List<TabHaobanExternalClerkRelated> memberList = this.getAddTimeByMemberId(memberId, enterpriseId);
                 Date date = new Date();

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

@@ -220,7 +220,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             int count = externalClerkRelatedService.getCountByMemberId(memberId);
             if (count == 0) {
                 logger.info("通知会员 删除企微好友,该会员无任何好友关系，memberId:{}", memberId);
-                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
+//                memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 0);
                 // 查询好办外部联系人接口,获取最近删除的时间
                 List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId);
                 Date date = new Date();

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

@@ -734,7 +734,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         this.pushTagSync(memberId, wxEnterpriseId, enterpriseId);
         //回调给会员，更新是否为企微好友
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
-        this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
+//        this.memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
         // 查询好办外部联系人接口，获取最早的时间替换当前时间
         List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId);
         Date date = new Date();
@@ -1462,7 +1462,24 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if(StringUtils.isNotBlank(memberId)) {
             this.pushTagSync(memberId, wxEnterpriseId, enterpriseId);
             log.info("通知会员 更新为企微好友 memberId:{}", memberId);
-            memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
+//            memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
+            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){
+                    Date addTime = new Date(a.getAddTime() * 1000L);
+                    if ((a.getStatusFlag() == 1 || a.getStatusFlag() == 3 || a.getStatusFlag() == 4) && opTime.before(addTime)){
+                        opTime= addTime;
+                        date = opTime;
+                    }
+                    if (firstTime.after(addTime)){
+                        firstTime = addTime;
+                    }
+                }
+            }
+            this.memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, date,firstTime);
         }
         return "";
     }