From 621882746b29b71669ccdc9529eb7c7988f93a0e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 19 五月 2025 08:20:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 13 +++++++++++--
1 files changed, 11 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 9a882aa..4390f95 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
@@ -146,7 +146,7 @@
if(delRetentionLis.size()>0){
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
- .eq(Retention::getType,Constants.memberType.internal)
+// .eq(Retention::getType,Constants.memberType.internal)
.in(Retention::getMemberId,delRetentionLis));
}
if(retentionList.size()>0){
@@ -1086,6 +1086,7 @@
delRetentionList.add(event.getPlateNos());
Retention dm = new Retention();
dm.setMemberId(event.getMemberId());
+ dm.setPhone(carrecord.getMemberPhone());
dm.setCarNo(event.getPlateNos());
delMemberRetentionList.add(dm);
retentionList.add(getRetentionModelByParkRequest(request,event,carrecord));//鍦ㄥ巶杞﹁締淇℃伅
@@ -1096,6 +1097,7 @@
delRetentionList.add(event.getPlateNos());
Retention dm = new Retention();
dm.setMemberId(event.getMemberId());
+ dm.setPhone(carrecord.getMemberPhone());
dm.setCarNo(event.getPlateNos());
delMemberRetentionList.add(dm);
inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
@@ -1125,7 +1127,12 @@
carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
carrecord.setCategoryParentId(category.getParentId());
for(Visits v :visitsList){
- delMemberRetentionList.add(event.getMemberId());
+ Retention dm = new Retention();
+ dm.setMemberId(event.getMemberId());
+ dm.setPhone(carrecord.getMemberPhone());
+ dm.setCarNo(event.getPlateNos());
+ delMemberRetentionList.add(dm);
+// delMemberRetentionList.add(event.getMemberId());
InoutRecord copyObj = new InoutRecord();
BeanUtils.copyProperties(carrecord,copyObj);
copyObj.setMemberId(v.getMemberId());
@@ -1396,6 +1403,7 @@
retention.setDeviceName(request.getSrcName());
retention.setDeviceIndex(request.getSrcIndex());
retention.setCarNo(inoutRecord.getCarCode());
+ retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
retention.setRemark("璺熼殢杞﹁締銆�"+inoutRecord.getCarCode()+"銆戝叆鍥尯");
return retention;
}
@@ -1412,6 +1420,7 @@
retention.setCategoryName(carrecord.getCategoryName());
retention.setCategoryParentId(carrecord.getCategoryParentId());
retention.setCategoryParentName(carrecord.getCategoryParentName());
+ retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
// retention.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
--
Gitblit v1.9.3