From 5c614500462df4507bf8ea723e46352933bcfa6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 14:43:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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 77df037..fc478ce 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
@@ -239,14 +239,14 @@
record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
record.setType(Constants.ONE);//浜哄憳
- record.setMemberType(Constants.ZERO);//榛樿涓烘湭鐭ヤ汉鍛橈紙璁垮锛�
+ record.setMemberType(Constants.RetentionMemberType.fk);//榛樿涓烘湭鐭ヤ汉鍛橈紙璁垮锛�
record.setIsdeleted(Constants.ZERO);
- record.setInOrOut(Constants.ZERO);
record.setHkEventId(request.getEventId());
record.setHkId(userNo);
if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+ record.setInOrOut(Constants.ZERO);
inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘
}else{
//濡傛灉鏄嚭闂�
@@ -257,9 +257,9 @@
if(member !=null){
record.setMemberId(member.getId());
record.setMemberName(member.getName());
+ record.setMemberPhone(member.getPhone());
record.setObjId(member.getId());
record.setObjType(Constants.ONE);
- record.setMemberPhone(member.getPhone());
record.setCompanyId(member.getCompanyId());
record.setCompanyName(member.getCompanyNamePath());
if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
@@ -268,22 +268,26 @@
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
retentionList.add(getRetentionModelByRequest(member,request));
if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
- record.setMemberType(Constants.ONE);
+ record.setMemberType(Constants.RetentionMemberType.internalMember);
inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);//鍐呴儴浜哄憳鍏ュ満浜烘
}else{
- record.setMemberType(Constants.TWO);
+ record.setMemberType(Constants.RetentionMemberType.relMember);
inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);//鐩稿叧鏂瑰叆鍦轰汉娆�
}
}else{
if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+ record.setMemberType(Constants.RetentionMemberType.internalMember);
inoutDayCount.setOutSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutSelfMemberNum())+1);//鍐呴儴浜哄憳鍑哄満浜烘
}else{
+ record.setMemberType(Constants.RetentionMemberType.relMember);
inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);//鐩稿叧鏂瑰嚭鍦轰汉娆�
}
}
}
+ if(record.getMemberType()!=null){
+ inoutRecordList.add(record);
+ }
}
- inoutRecordList.add(record);
}
}
@@ -940,8 +944,8 @@
carrecord.setCategoryId(carModel.getCateId());
carrecord.setCategoryName(carModel.getCateName());
carrecord.setCategoryParentId(carModel.getCatePId());
- carrecord.setCategoryParentName(carModel.getCatePName());
- carrecord.setMemberType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
+ carrecord.setCategoryParentName(StringUtils.defaultString(carModel.getCatePName(),carModel.getCateName()));
+ carrecord.setType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
if(carModel.getMemberId()!=null){
if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
//鍐呴儴缁勭粐
@@ -979,7 +983,7 @@
carrecord.setObjType(Constants.FOUR);
carrecord.setCompanyId(carTypeJob.getCompanyId());
carrecord.setCompanyName(carTypeJob.getCompanyNamePath());
- carrecord.setMemberType(Constants.RetentionMemberType.car);
+ carrecord.setType(Constants.RetentionMemberType.car);
if(carModel.getMemberPhone()!=null || StringUtils.isNotBlank(carModel.getMemberName())){
//璐ц繍鍙告満(濡傛灉鍙告満鎵嬫満鍙锋垨鑰呭鍚嶄笉涓虹┖锛�
carrecord.setMemberType(Constants.RetentionMemberType.driver);
@@ -1048,8 +1052,8 @@
carrecord.setCarBizType(Constants.RetentionCarType.fkCar);
Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
carrecord.setCategoryId(category.getId());
- carrecord.setCategoryName(category.getName());
- carrecord.setCategoryParentName(category.getParentName());
+ carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
+ carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
carrecord.setCategoryParentId(category.getParentId());
for(Visits v :visitsList){
delMemberRetentionList.add(event.getMemberId());
@@ -1059,7 +1063,7 @@
copyObj.setMemberName(v.getName());
copyObj.setMemberPhone(v.getPhone());
copyObj.setCompanyName(v.getCompanyName());
- copyObj.setMemberType(Constants.ZERO);
+ copyObj.setType(Constants.ONE);
copyObj.setRemark(carrecord.getCarCode());
copyObj.setCarCode(index>=0?null:carrecord.getCarCode());
copyObj.setMemberType(Constants.RetentionMemberType.fk);
@@ -1085,7 +1089,7 @@
}
}
}
- if(event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
+ if(carrecord.getInOrOut()!=null && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
//褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
dealNotFkCarMemberBiz(event,request,carrecord,retentionList,inoutDayCount,inoutRecordList);
}
@@ -1126,6 +1130,10 @@
}
}
if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰�
+ if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
+ carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+ carrecord.setCategoryParentName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+ }
inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
}
}
@@ -1134,6 +1142,9 @@
if(categoryList!=null){
for(Category category :categoryList){
if(Constants.equalsInteger(carType,category.getBizType())){
+ if(StringUtils.isBlank(category.getParentName() )){
+ category.setParentName(category.getName());
+ }
return category;
}
}
--
Gitblit v1.9.3