From 8c066c39b9e5ebc39992f7152bf706acdae00f4a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 31 五月 2024 17:53:10 +0800
Subject: [PATCH] 优化押金退款功能
---
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
index d6267d6..9bba66a 100755
--- a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -490,7 +490,7 @@
parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
- if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
+ if (ListUtil.isNull(parkingSpaceDtos)) { //鏁版嵁鏈夐棶棰�
return objName;
}
objName = objName + "-" + parkingSpaceDtos.get(0).getAreaNum() + "鍋滆溅鍦�" + "-" + parkingSpaceDtos.get(0).getNum() + "杞︿綅";
@@ -506,6 +506,19 @@
}
return objName;
+ }
+
+ @Override
+ public OwnerDto getFeeOwnerDto(String feeId) {
+
+ FeeDto feeDto = new FeeDto();
+ feeDto.setFeeId(feeId);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+ Assert.listOnlyOne(feeDtos, "璐圭敤涓嶅瓨鍦�");
+ feeDtos.get(0).setFeeAttrDtos(null); // todo 杩欓噷璁剧疆涓虹┖锛屼笉瑕佷粠灞炴�т腑鏌ヤ互闃叉暟鎹湁闂瀵艰嚧鏈夐棶棰�
+
+ return getFeeOwnerDto(feeDtos.get(0));
}
@Override
@@ -559,7 +572,7 @@
private OwnerDto getOwnerDtoByFeeAttr(FeeDto feeDto) {
List<FeeAttrDto> feeAttrDtos = feeDto.getFeeAttrDtos();
- if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
+ if (ListUtil.isNull(feeAttrDtos)) {
return null;
}
@@ -2173,11 +2186,11 @@
//todo 鏈疆閫掑鏃堕棿鏈埌 璐圭敤deadlineTime
if (curCycleRateEneTime.getTime() < feeDto.getDeadlineTime().getTime()) {
curOweMonth = DateUtil.dayCompare(curOweStartTime, curCycleRateEneTime);
- hasInRateMonth = rateStartMonthIn(oRateStartTime,curOweStartTime,curCycleRateEneTime);
+ hasInRateMonth = rateStartMonthIn(oRateStartTime, curOweStartTime, curCycleRateEneTime);
curOweStartTime = curCycleRateEneTime;
} else {
curOweMonth = DateUtil.dayCompare(curOweStartTime, feeDto.getDeadlineTime());
- hasInRateMonth = rateStartMonthIn(oRateStartTime,curOweStartTime,feeDto.getDeadlineTime());
+ hasInRateMonth = rateStartMonthIn(oRateStartTime, curOweStartTime, feeDto.getDeadlineTime());
curOweStartTime = feeDto.getDeadlineTime();
}
@@ -2201,6 +2214,7 @@
/**
* 閫掑鏈堝湪杩欎釜涔嬮棿
+ *
* @param oRateStartTime
* @param startTime
* @param endTime
@@ -2210,7 +2224,7 @@
Calendar calendarStartTime = Calendar.getInstance();
calendarStartTime.setTime(startTime);
- calendarStartTime.set(Calendar.DAY_OF_MONTH,1);
+ calendarStartTime.set(Calendar.DAY_OF_MONTH, 1);
Calendar calendarEndTime = Calendar.getInstance();
calendarEndTime.setTime(endTime);
@@ -2219,15 +2233,15 @@
Calendar calendarOrate = Calendar.getInstance();
calendarOrate.setTime(oRateStartTime);
- calendarOrate.set(Calendar.YEAR,calendarStartTime.get(Calendar.YEAR));
+ calendarOrate.set(Calendar.YEAR, calendarStartTime.get(Calendar.YEAR));
- if(calendarStartTime.getTime().before(calendarOrate.getTime()) && calendarEndTime.getTime().after(calendarOrate.getTime())){
+ if (calendarStartTime.getTime().before(calendarOrate.getTime()) && calendarEndTime.getTime().after(calendarOrate.getTime())) {
return true;
}
- calendarOrate.set(Calendar.YEAR,calendarEndTime.get(Calendar.YEAR));
+ calendarOrate.set(Calendar.YEAR, calendarEndTime.get(Calendar.YEAR));
- if(calendarStartTime.getTime().before(calendarOrate.getTime()) && calendarEndTime.getTime().after(calendarOrate.getTime())){
+ if (calendarStartTime.getTime().before(calendarOrate.getTime()) && calendarEndTime.getTime().after(calendarOrate.getTime())) {
return true;
}
--
Gitblit v1.8.0