From 24cfde30df8f15eee2abfea396f6cee715567070 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:44:28 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 fc478ce..83d0616 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
@@ -1023,7 +1023,7 @@
                 //濡傛灉鏄叆鍘傛斁琛�
                 delRetentionList.add(event.getPlateNos());
                 delMemberRetentionList.add(event.getMemberId());
-                retentionList.add(getRetentionModelByParkRequest(request,event));//鍦ㄥ巶杞﹁締淇℃伅
+                retentionList.add(getRetentionModelByParkRequest(request,event,carrecord));//鍦ㄥ巶杞﹁締淇℃伅
                 inoutDayCount.setInCarNum(Constants.formatIntegerNum(inoutDayCount.getInCarNum())+1);
                 carrecord.setInOrOut(Constants.ZERO);
             }else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
@@ -1322,7 +1322,7 @@
         retention.setRemark("璺熼殢杞﹁締鍏ュ洯鍖�");
         return retention;
     }
-    private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event  ) {
+    private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event ,InoutRecord carrecord ) {
         Retention retention = new Retention();
         retention.setIsdeleted(Constants.ZERO);
         retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
@@ -1331,6 +1331,10 @@
         retention.setMemberId(event.getMemberId());
         retention.setCarType(event.getCarType());
         retention.setCompanyId(event.getCompanyId());
+        retention.setCategoryId(carrecord.getCategoryId());
+        retention.setCategoryName(carrecord.getCategoryName());
+        retention.setCategoryParentId(carrecord.getCategoryParentId());
+        retention.setCategoryParentName(carrecord.getCategoryParentName());
 //        retention.setDeviceName(request.getSrcName());
 //        retention.setDeviceIndex(request.getSrcIndex());
 

--
Gitblit v1.9.3