From 769b8d3dbcf3d65dc94c7ac631fb65da56afefc4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 30 十二月 2020 23:08:38 +0800
Subject: [PATCH] 优化停车费导入功能
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 f25f1bb..4d7a4f2 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
@@ -15,6 +15,7 @@
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
@@ -59,6 +60,14 @@
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
+ //鍩�
+ public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
+
+ //閿�
+ public static final String TOTAL_FEE_PRICE = "TOTAL_FEE_PRICE";
+
+ //閿�
+ public static final String RECEIVED_AMOUNT_SWITCH = "RECEIVED_AMOUNT_SWITCH";
@Override
public ResponseEntity<String> query(FeeDto feeDto) {
@@ -74,8 +83,7 @@
}
List<FeeDto> tmpFeeDtos = new ArrayList<>();
for (FeeDto tmpFeeDto : feeDtos) {
- computeFeeSMOImpl.computeOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
-
+ computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
//濡傛灉閲戦涓�0 灏辨帓闄�
if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
tmpFeeDtos.add(tmpFeeDto);
@@ -143,7 +151,18 @@
feeDto.setPayerObjName(ownerCarDto.getCarNum() + "(" + parkingSpaceDto.getAreaNum() + "鍋滆溅鍦�" + parkingSpaceDto.getNum() + "杞︿綅)");
feeDto.setBuiltUpArea(parkingSpaceDto.getArea());
}
- return ResultVo.createResponseEntity(feeDto);
+ double feePrice = computeFeeSMOImpl.getFeePrice(feeDto);
+ feeDto.setFeePrice(feePrice);
+ //搴旀敹娆惧彇鍊�
+ String val = MappingCache.getValue(DOMAIN_COMMON, TOTAL_FEE_PRICE);
+ feeDto.setVal(val);
+ String received_amount_switch = MappingCache.getValue(DOMAIN_COMMON, RECEIVED_AMOUNT_SWITCH);
+ if(StringUtil.isEmpty(received_amount_switch)){
+ feeDto.setReceivedAmountSwitch("1");//榛樿鍚敤瀹炴敹娆捐緭鍏ユ
+ }else {
+ feeDto.setReceivedAmountSwitch(received_amount_switch);
+ }
+ return ResultVo.createResponseEntity(feeDto);
}
private boolean freshFeeDtoParam(FeeDto feeDto) {
--
Gitblit v1.8.0