From 6336a7e0059dd009a820b7b952b16f8d80bd8951 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 五月 2025 13:49:34 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 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 154ab24..9a882aa 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
@@ -871,7 +871,7 @@
List<CarEvent> list = new ArrayList<>();
List<Retention> retentionList = new ArrayList<>();
List<String> delRetentionList = new ArrayList<>();
- List<Integer> delMemberRetentionList = new ArrayList<>();
+ List<Retention> delMemberRetentionList = new ArrayList<>();
InoutDayCount inoutDayCount = new InoutDayCount();
List<InoutRecord> inoutRecordList = new ArrayList<>();
for(EventParkInfoRequest request : events){
@@ -886,18 +886,34 @@
carEventMapper.insert(list);
}
if(delRetentionList.size()>0){
- //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
+ //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満杞﹁締浜哄憳(鍐呴儴浜哄憳锛�
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
.eq(Retention::getType,Constants.THREE)
.in(Retention::getCarNo,delRetentionList));
}
if(delMemberRetentionList.size()>0){
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳銆佺浉鍏虫柟鍜岃瀹級
- retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
- .in(Retention::getType,Constants.RetentionMemberType.internalMember
- ,Constants.RetentionMemberType.relMember
- ,Constants.RetentionMemberType.fk)
- .in(Retention::getMemberId,delMemberRetentionList));
+ List<Integer> memberList = new ArrayList<>();
+ for(Retention m :delMemberRetentionList){
+ if(m.getMemberId()!=null){
+ //璺熼殢杞﹁締鍏ュ満鐨刴ember瀛樺湪鐨勬暟鎹珛鍦�
+ retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+ .in(Retention::getType,Constants.RetentionMemberType.internalMember
+ ,Constants.RetentionMemberType.relMember
+ ,Constants.RetentionMemberType.fk
+ ,Constants.RetentionMemberType.driver)
+ .eq(Retention::getMemberId,m.getMemberId()));
+ }else if(m.getCarNo()!=null){
+ //璺熼殢杞﹁締鍏ュ満鐨勭敤鎴蜂俊鎭�
+ retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+ .in(Retention::getType,Constants.RetentionMemberType.internalMember
+ ,Constants.RetentionMemberType.relMember
+ ,Constants.RetentionMemberType.fk
+ ,Constants.RetentionMemberType.driver)
+ .eq(Retention::getCarNo,m.getCarNo()));
+ }
+ }
+
}
if(retentionList.size()>0){
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
@@ -925,7 +941,7 @@
private CarEvent getParkEventModelByRequest(EventParkInfoRequest request
, List<String> delRetentionList
, List<Retention> retentionList
- , List<Integer> delMemberRetentionList
+ , List<Retention> delMemberRetentionList
, InoutDayCount inoutDayCount
, List<InoutRecord> inoutRecordList) {
CarEvent event =initCarEventModelByRequest(request);
@@ -1068,14 +1084,20 @@
if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
//濡傛灉鏄叆鍘傛斁琛�
delRetentionList.add(event.getPlateNos());
- delMemberRetentionList.add(event.getMemberId());
+ Retention dm = new Retention();
+ dm.setMemberId(event.getMemberId());
+ dm.setCarNo(event.getPlateNos());
+ delMemberRetentionList.add(dm);
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()){
//濡傛灉鏄嚭鍦烘斁琛�
delRetentionList.add(event.getPlateNos());
- delMemberRetentionList.add(event.getMemberId());
+ Retention dm = new Retention();
+ dm.setMemberId(event.getMemberId());
+ dm.setCarNo(event.getPlateNos());
+ delMemberRetentionList.add(dm);
inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
carrecord.setInOrOut(Constants.ONE);
}
@@ -1373,7 +1395,8 @@
retention.setMemberId(inoutRecord.getMemberId());
retention.setDeviceName(request.getSrcName());
retention.setDeviceIndex(request.getSrcIndex());
- retention.setRemark("璺熼殢杞﹁締鍏ュ洯鍖�");
+ retention.setCarNo(inoutRecord.getCarCode());
+ retention.setRemark("璺熼殢杞﹁締銆�"+inoutRecord.getCarCode()+"銆戝叆鍥尯");
return retention;
}
private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event ,InoutRecord carrecord ) {
--
Gitblit v1.9.3