From 074caee550216dfd4bb676677ae33cbd837c5710 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 27 八月 2025 18:17:21 +0800
Subject: [PATCH] 暂存0827
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
index 8522fce..20c18c6 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
@@ -124,7 +124,12 @@
// List<String> roomTypes = Arrays.asList("浣忓畢鐗╀笟璐�","鍟嗛摵鐗╀笟璐�","缁翠慨鏀跺叆","缁翠慨鍩洪噾鏀跺叆","鐢佃垂鍙婄鐞嗚垂","浠ｆ敹姘磋垂","鍚勭被鎶奸噾","绉熼噾鏀跺叆");
List<String> carTypes = Arrays.asList("涓存椂鍋滆溅璐�", "涓氫富浜ф潈杩囬亾鍋滆溅璐�", "灏忎笟涓讳骇鏉冭溅杈嗙鐞嗚垂","鍦颁笅鍋滆溅璐�","鍦伴潰鍋滆溅璐�");
List<String> contractTypes = Arrays.asList("鍨冨溇娓呰繍璐�","鍏朵粬鏀跺叆","琛ヨ创璐圭敤","鍦哄湴浣跨敤璐�","鐢垫骞垮憡锛堜笟濮斾細锛�","蹇�掓煖","鐢垫骞垮憡锛堣仈璁級","鎴夸骇涓粙","闈炴満鍔ㄨ溅绠＄悊璐�","鍏朵粬骞垮憡");
- if(importRoomFee.getSecondaryFeeTypeCd()!= null && importRoomFee.getSecondaryFeeTypeCd().equals("涓存椂鍋滆溅璐�-鍏朵粬")){
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setFeeName(importRoomFee.getSecondaryFeeTypeCdName());
+ feeConfigDto.setFeeTypeCds(new String[]{"630000007","630000017"});
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+
+ if(importRoomFee.getSecondaryFeeTypeCd()!= null && importRoomFee.getSecondaryFeeTypeCd().equals("涓存椂鍋滆溅璐�-鍏朵粬")){
CarInoutPo carInout = new CarInoutPo();
carInout.setCommunityId(communityId);
carInout.setCarNum("A888888");
@@ -165,7 +170,7 @@
}
}
- else if(contractTypes.contains(importRoomFee.getSecondaryFeeTypeCd())){
+ else if(contractTypes.contains(JSONObject.parseObject(assetImportLogDetailDto.getContent()).get("category22"))){
importRoomFee.setFeeName(data.getString("secondaryFeeTypeCd"));
importRoomFee.setCommunityId(communityId);
@@ -228,7 +233,7 @@
importFeeDetails(importRoomFees.get(0).getStoreId(), importRoomFees.get(0).getUserId(), importRoomFees, importRoomFees.get(0).getBatchId());
}
if(!(ListUtil.isNull(importCarFees))){
- importCarHistoryFeeDetailQueueDataAdapt.importCarFeeDetails(importCarFees.get(0).getStoreId(), importCarFees.get(0).getUserId(), importCarFees, importCarFees.get(0).getBatchId());
+ importCarHistoryFeeDetailQueueDataAdapt.importCarFeeDetails2(importCarFees.get(0).getStoreId(), importCarFees.get(0).getUserId(), importCarFees, importCarFees.get(0).getBatchId());
}
}
@@ -292,8 +297,8 @@
roomDto.setCommunityId(importRoomFee.getCommunityId());
if(importRoomFee.getDoorRoomNum()!=null){
String[] split = importRoomFee.getDoorRoomNum().split("-");
- if(split.length==2){
- roomDto.setDoorRoomNum(importRoomFee.getDoorRoomNum());
+ if(split.length < 2){
+ throw new IllegalArgumentException("闂ㄥ鍙�"+importRoomFee.getDoorRoomNum()+"鏈伒寰獂-x-x");
}else if(split.length > 2){
roomDto.setFloorNum(split[0]);
roomDto.setUnitNum(split[1]);
@@ -310,6 +315,9 @@
feeDto2.setFeeName(importRoomFee.getFeeName());
feeDto2.setPayerObjId(importRoomFee.getRoomId());
feeDto2.setCommunityId(importRoomFee.getCommunityId());
+ feeDto2.setStatusCd("0");
+ feeDto2.setUseStart(DateUtil.getDateFromStringA(importRoomFee.getStartTime()));
+ feeDto2.setUseEnd(DateUtil.getDateFromStringA(importRoomFee.getEndTime()));
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto2);
if(feeDtos.size() == 0){
updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("璐圭敤椤�"+importRoomFee.getFeeName()+"涓嶅瓨鍦�"));
@@ -363,7 +371,7 @@
// feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
}
if(feeDtos.size()>1){
- throw new IllegalArgumentException("璇ュ垵濮嬪寲缂磋垂璁板綍淇℃伅涓寘鍚涓垂鐢ㄨ褰�"+importRoomFee.getFeeName());
+ throw new IllegalArgumentException(importRoomFee.getDoorRoomNum() +importRoomFee.getFeeName() + "+" + importRoomFee.getStartTime() + "-" + importRoomFee.getEndTime() + "鏈尮閰嶅埌鏀惰垂椤�");
}
for (FeeDto tmpFeeDto : feeDtos) {
if(DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime() > tmpFeeDto.getMaxEndTime().getTime()){
@@ -475,7 +483,7 @@
// int i = feeInnerServiceSMOImpl.updateFee(feeInfo);
- if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime()) {
+ if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringA(importRoomFee.getEndTime()).getTime() + 2000) {
return;
}
@@ -485,13 +493,7 @@
payFeePo.setCommunityId(importRoomFee.getCommunityId());
payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
payFeePo.setFeeId(tmpFeeDto.getFeeId());
- String[] arr = importRoomFee.getEndTime().split(" ");
- if (arr.length >= 2 &&arr[1].equals("23:59:59")){
- payFeePo.setEndTime(DateUtil.getNextSecTime(importRoomFee.getEndTime()));
- }
- if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
- payFeePo.setState(FeeDto.STATE_FINISH);
- }
+ payFeePo.setState(FeeDto.STATE_FINISH);
feeInnerServiceSMOImpl.updateFee(payFeePo);
feeInfo = feeInnerServiceSMOImpl.queryFees(fee).get(0);
if (DateUtil.getFormatTimeStringB(feeInfo.getEndTime()).equals(DateUtil.getFormatTimeStringB(feeInfo.getMaxEndTime()))) {
--
Gitblit v1.8.0