From bb119f29de193c50efe03df37b114b1fc2689de1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 07 五月 2025 09:48:10 +0800
Subject: [PATCH] 提交
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 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 20e9aa3..77df037 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
@@ -255,6 +255,7 @@
}
}
if(member !=null){
+ record.setMemberId(member.getId());
record.setMemberName(member.getName());
record.setObjId(member.getId());
record.setObjType(Constants.ONE);
@@ -569,6 +570,7 @@
record.setIsdeleted(Constants.ZERO);
record.setMemberName(visits.getName());
record.setObjId(visits.getId());
+ record.setMemberId(visits.getMemberId());
record.setObjType(Constants.TWO);
record.setMemberPhone(visits.getPhone());
record.setCompanyName(visits.getCompanyName());
@@ -927,6 +929,7 @@
carrecord.setMemberName(carModel.getMemberName());//鍙告満
carrecord.setMemberPhone(carModel.getMemberPhone());//鍙告満
carrecord.setObjId(carModel.getId());
+ carrecord.setMemberId(carModel.getMemberId());
carrecord.setObjType(Constants.ZERO);
carrecord.setFaceImg(carModel.getFaceImg());
carrecord.setIdcardDecode(carModel.getIdcardDecode());
@@ -1027,8 +1030,8 @@
carrecord.setInOrOut(Constants.ZERO);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other)){//濡傛灉涓鸿瘑鍒埌杞﹀瀷
- //濡傛灉涓嶆槸鍥哄畾杞� 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
+ if(event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other)){
+ //濡傛灉鏈瘑鍒埌杞﹀瀷锛屼笉鏄浐瀹氳溅 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
.eq(Visits::getIsdeleted,Constants.ZERO )
@@ -1063,29 +1066,68 @@
inoutRecordList.add(copyObj);
index++;
if(Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)){
- //濡傛灉鏄溅杈嗗嚭鍥尯锛岃瀹㈢敵璇疯嚜鍔ㄧ绂�
- visitsService.visitLevelForCarOut(v);
+ //濡傛灉鏄溅杈嗗嚭鍥尯 缁熻璁垮杩涘叆鏁�
+ inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
+ try {
+ //璁垮鐢宠鑷姩绛剧
+ visitsService.visitLevelForCarOut(v);
+ //缁熻绛剧鏁�
+ inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
+ }catch (Exception e){
+ log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ }
}else{
//濡傛灉鏄繘鍏ュ洯鍖猴紝璁垮褰曞叆鍦ㄥ洯浜哄憳璁板綍
retentionList.add(getRetentionModelByRequest(copyObj,request));
+ //缁熻璁垮鍑鸿鏁�
+ inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
}
}
}
}
- //杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(event.getCarType() !=null && event.getCarType().equals(Constants.RetentionCarType.fkCar)) {
+ if(event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
//褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
- carrecord.setCarBizType(event.getCarType()==null?Constants.RetentionCarType.other:event.getCarType());
- if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)
- ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)
- ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.driver)){
- retentionList.add(getRetentionModelByRequest(carrecord,request));
- }
- inoutRecordList.add(carrecord);
+ dealNotFkCarMemberBiz(event,request,carrecord,retentionList,inoutDayCount,inoutRecordList);
}
-
}
return event;
+ }
+
+ private void dealNotFkCarMemberBiz( CarEvent event ,EventParkInfoRequest request, InoutRecord carrecord,List<Retention> retentionList,InoutDayCount inoutDayCount,List<InoutRecord> inoutRecordList) {
+ //褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
+ carrecord.setCarBizType(event.getCarType()==null?Constants.RetentionCarType.other:event.getCarType());
+ if(carrecord.getMemberId()!=null
+ && (Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)
+ ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)
+ ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.driver))){
+ if( Constants.equalsInteger(carrecord.getInOrOut(),Constants.ZERO)) {
+ //濡傛灉鏄繘鍏�
+ retentionList.add(getRetentionModelByRequest(carrecord,request));
+ if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
+ //濡傛灉鏄浉鍏虫柟浜哄憳锛岀粺璁′粖鏃ョ疮璁℃暟
+ inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);
+ }else if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)){
+ //濡傛灉鏄唴閮ㄤ汉鍛�,缁熻浠婃棩绱鏁�
+ inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);
+ }
+ //缁熻浠婃棩鍏ュ洯鎬讳汉娆�
+ inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);
+ }else if(carrecord.getMemberId()!=null && Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
+ //濡傛灉鏄嚭鍥尯
+ if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
+ //濡傛灉鏄浉鍏虫柟锛岀粺璁′粖鏃ョ疮璁℃暟
+ inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);
+ }else if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)){
+ //濡傛灉鏄唴閮ㄤ汉鍛橈紝缁熻浠婃棩绱鏁�
+ inoutDayCount.setOutSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutSelfMemberNum())+1);
+ }
+ //缁熻浠婃棩鍑哄洯鎬讳汉娆�
+ inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);
+ }
+ }
+ if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰�
+ inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
+ }
}
private Category findCategoryByBizType(Integer carType,String tempname, String pName,List<Category> categoryList) {
@@ -1146,7 +1188,6 @@
//濡傛灉鏄嚜鏈夎溅鍗歌揣 鏌ヨTMS鍚堝悓鐘舵�侊紝鍐冲畾鏄惁鑷姩绛惧埌
checkTmsContractStatusBiz(platformJob);
}
-
}
}
}
--
Gitblit v1.9.3