From 4356029f74f35f4df426f223e1c774f4912984a6 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 26 二月 2024 22:44:24 +0800
Subject: [PATCH] 优化结束时间
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
index 23ec8ac..c2c54b3 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
@@ -81,7 +81,7 @@
feeDto.setState(FeeDto.STATE_DOING);
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- if (feeDtos == null || feeDtos.size() < 1) {
+ if (ListUtil.isNull(feeDtos)) {
feeDtos = new ArrayList<>();
return ResultVo.createResponseEntity(feeDtos);
}
@@ -92,7 +92,14 @@
List<FeeDto> tmpFeeDtos = new ArrayList<>();
for (FeeDto tmpFeeDto : feeDtos) {
try {
- computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
+ //todo 鏈夌洰鏍囩粨鏉熸椂闂�,骞朵笖涓嶆槸涓�娆℃�ц垂鐢�
+ if (!StringUtil.isEmpty(feeDto.getTargetEndTime())
+ && !FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
+ ) {
+ computeFeeSMOImpl.computeEveryOweFeeByTargetEndTime(tmpFeeDto, feeDto.getTargetEndTime());//璁＄畻娆犺垂閲戦
+ } else {
+ computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
+ }
//濡傛灉閲戦涓�0 灏辨帓闄�
tmpFeeDto.setFeeTotalPrice(
MoneyUtil.computePriceScale(
--
Gitblit v1.8.0