From c5675aa3b997583cae930b5cfb4b6487e4d38cfa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 14:14:53 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 337f753..1e5d6e6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -280,9 +280,9 @@
                             inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);//鐩稿叧鏂瑰嚭鍦轰汉娆�
                         }
                     }
-                }
-                if(record.getMemberType()!=null){
-                    inoutRecordList.add(record);
+                    if(record.getMemberType()!=null){
+                        inoutRecordList.add(record);
+                    }
                 }
             }
         }
@@ -569,7 +569,7 @@
                 record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
                 record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
                 record.setType(Constants.ONE);//浜哄憳
-                record.setMemberType(Constants.ZERO);
+                record.setMemberType(Constants.RetentionMemberType.fk);
                 record.setIsdeleted(Constants.ZERO);
                 record.setMemberName(visits.getName());
                 record.setObjId(visits.getId());
@@ -890,9 +890,11 @@
                         .in(Retention::getCarNo,delRetentionList));
             }
             if(delMemberRetentionList.size()>0){
-                //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳鍜岃瀹級
+                //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳銆佺浉鍏虫柟鍜岃瀹級
                 retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
-                        .in(Retention::getType,Constants.memberType.internal,Constants.memberType.visitor)
+                        .in(Retention::getType,Constants.RetentionMemberType.internalMember
+                                ,Constants.RetentionMemberType.relMember
+                                ,Constants.RetentionMemberType.fk)
                         .in(Retention::getMemberId,delMemberRetentionList));
             }
             if(retentionList.size()>0){

--
Gitblit v1.9.3