删好友调整

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

@@ -73,10 +73,10 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
             if (qdto.isDelFlag()) {
                 TabWxUserAddLog logUser = this.wxUserAddLogMapper.selectNewLog(externalUserid, qdto.getStaffId());
                 if(null == logUser) {
-                    log.info("删除好友") ;
-                    return ;
+                    log.info("删除好友-无加的记录") ;
+                }else {
+                    entity = logUser;
                 }
-                entity = logUser;
                 entity.setLogId(UniqueIdUtils.uniqueLong());
                 if(qdto.isDelClerkFlag()) {
                     entity.setStatusFlag(3);

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

@@ -770,6 +770,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         Date firstTime = new Date();
         if (CollectionUtils.isNotEmpty(memberList)){
             for (TabHaobanExternalClerkRelated a : memberList){
+                if(null == a.getAddTime()) {
+                    continue;
+                }
                 Date addTime = new Date(a.getAddTime() * 1000L);
                 if ((a.getStatusFlag() == 1 || a.getStatusFlag() == 3 || a.getStatusFlag() == 4) && opTime.before(addTime)){
                     opTime= addTime;