From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java b/service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java
index 211cea2..afa87d4 100644
--- a/service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java
@@ -106,26 +106,18 @@
computeFeePrice(feeDtos);
fees = BeanConvertUtil.covertBeanList(feeDtos, ApiFeeDataVo.class);
freshFeeAttrs(fees, feeDtos);
-
-
} else {
fees = new ArrayList<>();
}
-
ApiFeeVo apiFeeVo = new ApiFeeVo();
-
apiFeeVo.setTotal(count);
apiFeeVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
apiFeeVo.setFees(fees);
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiFeeVo), HttpStatus.OK);
-
context.setResponseEntity(responseEntity);
-
}
private void freshFeeAttrs(List<ApiFeeDataVo> fees, List<FeeDto> feeDtos) {
-
for (ApiFeeDataVo apiFeeDataVo : fees) {
for (FeeDto feeDto : feeDtos) {
if (apiFeeDataVo.getFeeId().equals(feeDto.getFeeId())) {
@@ -136,7 +128,6 @@
}
private void computeFeePrice(List<FeeDto> feeDtos) {
-
for (FeeDto feeDto : feeDtos) {
try {
// 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
@@ -155,7 +146,6 @@
}
}
}
-
private void computeFeePriceByCar(FeeDto feeDto, double oweMonth) {
OwnerCarDto ownerCarDto = new OwnerCarDto();
@@ -205,5 +195,4 @@
feeDto.setDeadlineTime(DateUtil.getCurrentDate());
}
}
-
}
--
Gitblit v1.8.0