From 491c9453406c86c6fc2546189e28fb697477d09c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 六月 2025 15:25:51 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 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 38f9329..244d0e3 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
@@ -1079,9 +1079,9 @@
                     carrecord.setCategoryParentId(category.getParentId());
                 }
             }
-            //澶勭悊鑷湁杞﹁嚜鍔ㄧ鍒颁笟鍔�
-            dealSelTruckAutoSignBiz(request,event);
             if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
+                //澶勭悊鑷湁杞﹁嚜鍔ㄧ鍒颁笟鍔�
+                dealSelTruckAutoSignBiz(request,event);
                 //濡傛灉鏄叆鍘傛斁琛�
                 delRetentionList.add(event.getPlateNos());
                 Retention dm = new Retention();
@@ -1120,13 +1120,13 @@
                     event.setCarType(Constants.RetentionCarType.fkCar);
                     int index =0;
                     carrecord.setCarBizType(Constants.RetentionCarType.fkCar);
-                    if(1==2){
-                        Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
-                        carrecord.setCategoryId(category.getId());
-                        carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
-                        carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
-                        carrecord.setCategoryParentId(category.getParentId());
-                        for(Visits v :visitsList){
+                    Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
+                    carrecord.setCategoryId(category.getId());
+                    carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
+                    carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
+                    carrecord.setCategoryParentId(category.getParentId());
+                    for(Visits v :visitsList){
+                        if(v.getEndtime()!=null && v.getEndtime().getTime() < System.currentTimeMillis()){
                             Retention dm = new Retention();
                             dm.setMemberId(event.getMemberId());
                             dm.setPhone(carrecord.getMemberPhone());
@@ -1261,6 +1261,7 @@
                                 Constants.PlatformJobStatus.CALLED.getKey(),
                                 Constants.PlatformJobStatus.WORKING.getKey(),
                                 Constants.PlatformJobStatus.TRANSFERING.getKey(),
+                                Constants.PlatformJobStatus.OVER_NUMBER.getKey(),
                                 Constants.PlatformJobStatus.EXCEPTION.getKey()
                         )
                 )==Constants.ZERO){//濡傛灉娌¤繘琛屼腑浠诲姟

--
Gitblit v1.9.3