From ead28b37bf236d59dc524817589c80a5f7089801 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 23 六月 2020 21:19:40 +0800
Subject: [PATCH] 优化车位出租
---
service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
index bc89e53..ea5d098 100644
--- a/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
@@ -340,8 +340,7 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setIsDefault("T");
+ feeConfigDto.setConfigId(paramInJson.getString("configId"));
feeConfigDto.setCommunityId(paramInJson.getString("communityId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
@@ -350,29 +349,29 @@
feeConfigDto = feeConfigDtos.get(0);
- double receivableAmount = isHireParkingSpace(paramInJson) ? Double.parseDouble(feeConfigDto.getAdditionalAmount())
- * Double.parseDouble(paramInJson.getString("cycles")) : Double.parseDouble(feeConfigDto.getAdditionalAmount());
+ double receivableAmount = Double.parseDouble(feeConfigDto.getAdditionalAmount())
+ * Double.parseDouble(paramInJson.getString("cycles"));
paramInJson.put("receivableAmount", receivableAmount);
paramInJson.put("configId", feeConfigDto.getConfigId());
//璁＄畻 amount
- String amount = isHireParkingSpace(paramInJson) ? "-1.00" : String.valueOf(receivableAmount);
+ String amount = "-1.00";
paramInJson.put("amount", amount);
//璁＄畻 cycles
- String cycles = isHireParkingSpace(paramInJson) ? paramInJson.getString("cycles") : "1";
+ String cycles = paramInJson.getString("cycles");
paramInJson.put("cycles", cycles);
//璁＄畻缁撴潫鏃堕棿
- String endTime = "2038-01-01 00:00:00";
- if (isHireParkingSpace(paramInJson)) {
- Date et = DateUtil.getCurrentDate();
- Calendar endCalender = Calendar.getInstance();
- endCalender.setTime(et);
- endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
- endTime = DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A);
- }
+ String endTime = "";
+
+ Date et = DateUtil.getCurrentDate();
+ Calendar endCalender = Calendar.getInstance();
+ endCalender.setTime(et);
+ endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+ endTime = DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A);
+
paramInJson.put("endTime", endTime);
--
Gitblit v1.8.0