From 4b6f3a3ae7352830a532ec14fe79747b43698147 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 29 一月 2021 12:41:25 +0800
Subject: [PATCH] 优化空置房
---
service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java
index 3f07b2a..66b38eb 100644
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java
@@ -163,6 +163,14 @@
List<PayFeeConfigDiscountDto> payFeeConfigDiscountDtos =
payFeeConfigDiscountInnerServiceSMOImpl.queryPayFeeConfigDiscounts(payFeeConfigDiscountDto);
if (payFeeConfigDiscountDtos == null || payFeeConfigDiscountDtos.size() < 1) {
+ computeApplyRoomDiscount(feeDetailDto, simpleDateFormat, c, computeDiscountDtos);
+ //鍙栧嚭寮�鍏虫槧灏勭殑鍊�
+ String value = MappingCache.getValue(DOMAIN_COMMON, DISCOUNT_MODE);
+ List<ComputeDiscountDto> computeDiscountDtoList = new ArrayList<>();
+ for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+ computeDiscountDto.setValue(value);
+ computeDiscountDtoList.add(computeDiscountDto);
+ }
return computeDiscountDtos;
}
c.setTime(feeDetailDto.getStartTime());
@@ -181,7 +189,19 @@
continue;
}
}
- if (!StringUtil.isEmpty(feeDetailDto.getPayerObjType()) && feeDetailDto.getPayerObjType().equals("3333")) {
+ computeApplyRoomDiscount(feeDetailDto, simpleDateFormat, c, computeDiscountDtos);
+ //鍙栧嚭寮�鍏虫槧灏勭殑鍊�
+ String value = MappingCache.getValue(DOMAIN_COMMON, DISCOUNT_MODE);
+ List<ComputeDiscountDto> computeDiscountDtoList = new ArrayList<>();
+ for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+ computeDiscountDto.setValue(value);
+ computeDiscountDtoList.add(computeDiscountDto);
+ }
+ return computeDiscountDtoList;
+ }
+
+ private void computeApplyRoomDiscount(@RequestBody FeeDetailDto feeDetailDto, SimpleDateFormat simpleDateFormat, Calendar c, List<ComputeDiscountDto> computeDiscountDtos) {
+ if (!StringUtil.isEmpty(feeDetailDto.getPayerObjType()) && FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDetailDto.getPayerObjType())) {
//鏍规嵁鎴垮眿ID,鍘绘姌鎵ｇ敵璇疯〃鏌ヨ鏄惁鏈夋姌鎵�
ApplyRoomDiscountDto applyRoomDiscountDto = new ApplyRoomDiscountDto();
//瀹℃牳宸查�氳繃
@@ -201,7 +221,7 @@
//鏌ヨ鎶樻墸鐢宠琛�
List<ApplyRoomDiscountDto> applyRoomDiscountDtos = applyRoomDiscountInnerServiceSMOImpl.queryApplyRoomDiscounts(applyRoomDiscountDto);
//鍒ゆ柇鏌ヨ鐨勬姌鎵ｇ敵璇疯〃鏄惁鏈夋暟鎹�
- if (applyRoomDiscountDtos.size() > 0) {
+ if (applyRoomDiscountDtos != null && applyRoomDiscountDtos.size() > 0) {
//鑾峰彇浼樻儬id
String discountId = applyRoomDiscountDtos.get(0).getDiscountId();
PayFeeConfigDiscountDto payFeeConfigDiscount = new PayFeeConfigDiscountDto();
@@ -210,14 +230,6 @@
doCompute(payFeeConfigDiscount, Double.parseDouble(feeDetailDto.getCycles()), computeDiscountDtos, feeDetailDto.getFeeId());
}
}
- //鍙栧嚭寮�鍏虫槧灏勭殑鍊�
- String value = MappingCache.getValue(DOMAIN_COMMON, DISCOUNT_MODE);
- List<ComputeDiscountDto> computeDiscountDtoList = new ArrayList<>();
- for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
- computeDiscountDto.setValue(value);
- computeDiscountDtoList.add(computeDiscountDto);
- }
- return computeDiscountDtoList;
}
private void doCompute(PayFeeConfigDiscountDto tmpPayFeeConfigDiscountDto, double cycles, List<ComputeDiscountDto> computeDiscountDtos, String feeId) {
--
Gitblit v1.8.0