From 4ce807bb99088dc6f41262046830fc872e772be4 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期二, 02 九月 2025 14:23:33 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ListOwnerOweFeeCmd.java | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListOwnerOweFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListOwnerOweFeeCmd.java
index 10477a4..bb57df2 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListOwnerOweFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListOwnerOweFeeCmd.java
@@ -5,7 +5,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.fee.BillOweFeeDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
@@ -21,6 +21,7 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -67,7 +68,7 @@
List<FeeDto> resultFees = new ArrayList<>();
- if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) {
+ if (!ListUtil.isNull(ownerRoomRelDtos)) {
getRoomOweFee(ownerRoomRelDtos, reqJson, resultFees);
}
@@ -78,7 +79,7 @@
ownerCarDto.setCommunityId(reqJson.getString("communityId"));
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- if (ownerCarDtos != null && ownerCarDtos.size() > 0) {
+ if (!ListUtil.isNull(ownerCarDtos)) {
getParkingSpaceOweFee(ownerCarDtos, reqJson, resultFees);
}
@@ -153,7 +154,7 @@
if (FeeConfigDto.BILL_TYPE_EVERY.equals(tmpFeeConfigDto.getBillType())) {//鐩存帴璁＄畻 娆犺垂閲戦
computeFeePriceByRoom(feeDto);
- double month = dayCompare(endTime, DateUtil.getCurrentDate());
+ double month = DateUtil.dayCompare(endTime, DateUtil.getCurrentDate());
BigDecimal feePrice = new BigDecimal(feeDto.getFeePrice());
feePrice = feePrice.multiply(new BigDecimal(month));
FeeDto tmpFeeDto = new FeeDto();
@@ -255,33 +256,5 @@
}
feeDto.setFeePrice(feePrice);
- }
-
-
- /**
- * 璁＄畻2涓棩鏈熶箣闂寸浉宸殑 浠ュ勾銆佹湀銆佹棩涓哄崟浣嶏紝鍚勮嚜璁＄畻缁撴灉鏄灏�
- * 姣斿锛�2011-02-02 鍒� 2017-03-02
- * 浠ュ勾涓哄崟浣嶇浉宸负锛�6骞�
- * 浠ユ湀涓哄崟浣嶇浉宸负锛�73涓湀
- * 浠ユ棩涓哄崟浣嶇浉宸负锛�2220澶�
- *
- * @param fromDate
- * @param toDate
- * @return
- */
- public static double dayCompare(Date fromDate, Date toDate) {
- Calendar from = Calendar.getInstance();
- from.setTime(fromDate);
- Calendar to = Calendar.getInstance();
- to.setTime(toDate);
-
- long t1 = from.getTimeInMillis();
- long t2 = to.getTimeInMillis();
- double days = (t2 - t1)*1.00/ (24 * 60 * 60 * 1000);
-
- BigDecimal tmpDays = new BigDecimal(days);
- BigDecimal monthDay = new BigDecimal(30);
-
- return tmpDays.divide(monthDay, 2, RoundingMode.HALF_UP).doubleValue();
}
}
--
Gitblit v1.8.0