From 2bac44b5f569357beec90e6ce60940802432c5e6 Mon Sep 17 00:00:00 2001
From: jinhai <9314122@qq.com>
Date: 星期日, 13 九月 2020 17:34:29 +0800
Subject: [PATCH] 新增预存费用功能
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 84d2b87..95ea105 100644
--- 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
@@ -194,7 +194,7 @@
computeRoomFee(roomFees, roomIds);
}
- if (roomFees.size() > 0) {
+ if (psFees.size() > 0) {
computePsFee(psFees, psIds);
}
}
@@ -213,22 +213,16 @@
if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
return;
}
- List<String> ownerIds = new ArrayList<>();
for (ParkingSpaceDto tmpParkingSpaceDto : parkingSpaceDtos) {
for (FeeDto feeDto : psFees) {
dealFeePs(tmpParkingSpaceDto, feeDto);
}
- ownerIds.add(tmpParkingSpaceDto.getOwnerId());
- }
-
- if (ownerIds.size() < 1) {
- return;
}
OwnerDto ownerDto = new OwnerDto();
- ownerDto.setOwnerIds(ownerIds.toArray(new String[ownerIds.size()]));
+ ownerDto.setOwnerIds(psIds.toArray(new String[psIds.size()]));
ownerDto.setCommunityId(psFees.get(0).getCommunityId());
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByParkingSpace(ownerDto);
for (OwnerDto tmpOwnerDto : ownerDtos) {
for (FeeDto feeDto : psFees) {
@@ -264,7 +258,7 @@
double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
BigDecimal price = new BigDecimal(feeDto.getFeePrice());
price = price.multiply(new BigDecimal(month));
- feeDto.setAmountOwed(price.doubleValue() + "");
+ feeDto.setAmountOwed(price.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + "");
}
/**
@@ -308,7 +302,7 @@
}
feeDto.setOwnerName(tmpOwnerDto.getName());
- feeDto.setOwnerTel(feeDto.getOwnerTel());
+ feeDto.setOwnerTel(tmpOwnerDto.getLink());
}
private void dealFeeRoom(RoomDto tmpRoomDto, FeeDto feeDto) {
@@ -338,7 +332,7 @@
double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
BigDecimal price = new BigDecimal(feeDto.getFeePrice());
price = price.multiply(new BigDecimal(month));
- feeDto.setAmountOwed(price.doubleValue() + "");
+ feeDto.setAmountOwed(price.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + "");
}
@@ -413,8 +407,11 @@
} else {
feePrice = 0.00;
}
-
feeDto.setFeePrice(feePrice);
+ double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
+ BigDecimal price = new BigDecimal(feeDto.getFeePrice());
+ price = price.multiply(new BigDecimal(month));
+ feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
}
@@ -450,8 +447,11 @@
feePrice = 0.00;
}
-
feeDto.setFeePrice(feePrice);
+ double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
+ BigDecimal price = new BigDecimal(feeDto.getFeePrice());
+ price = price.multiply(new BigDecimal(month));
+ feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
}
--
Gitblit v1.8.0