From 6bf8b48e9d689ab90864bc2ee0e6ebeae3a4c1fa Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 04 八月 2022 10:06:47 +0800
Subject: [PATCH] 1.优化报表缴费明细统计问题2、优化调查问卷投票问题3、优化投诉咨询问题3、优化业主新增用户联系地址4、增加定时任务根据身份证号自动更新年龄5、优化缴费清单
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 11 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 64d449a..81dc9dd 100755
--- 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
@@ -1,7 +1,9 @@
package com.java110.fee.bmo.impl;
import com.alibaba.fastjson.JSONArray;
+import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.factory.Java110ThreadPoolFactory;
+import com.java110.core.log.LoggerFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeConfigDto;
@@ -21,10 +23,10 @@
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.NumberUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -70,6 +72,9 @@
//閿�
public static final String RECEIVED_AMOUNT_SWITCH = "RECEIVED_AMOUNT_SWITCH";
+ //绂佺敤鐢佃剳绔彁浜ゆ敹璐规寜閽�
+ public static final String OFFLINE_PAY_FEE_SWITCH = "OFFLINE_PAY_FEE_SWITCH";
+
@Override
public ResponseEntity<String> query(FeeDto feeDto) {
@@ -82,12 +87,22 @@
feeDtos = new ArrayList<>();
return ResultVo.createResponseEntity(feeDtos);
}
+ String val = CommunitySettingFactory.getValue(feeDtos.get(0).getCommunityId(), TOTAL_FEE_PRICE);
+ if (StringUtil.isEmpty(val)) {
+ val = MappingCache.getValue(DOMAIN_COMMON, TOTAL_FEE_PRICE);
+ }
List<FeeDto> tmpFeeDtos = new ArrayList<>();
for (FeeDto tmpFeeDto : feeDtos) {
- computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
- //濡傛灉閲戦涓�0 灏辨帓闄�
- if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
- tmpFeeDtos.add(tmpFeeDto);
+ try {
+ computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
+ //濡傛灉閲戦涓�0 灏辨帓闄�
+ //if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+ tmpFeeDto.setVal(val);
+ if (tmpFeeDto.getFeePrice() > 0) {
+ tmpFeeDtos.add(tmpFeeDto);
+ }
+ } catch (Exception e) {
+ logger.error("鍙兘璐圭敤璧勬枡鏈夐棶棰樺鑷寸畻璐瑰け璐�", e);
}
}
@@ -119,8 +134,21 @@
if (feeDtos == null || feeDtos.size() < 1) {
return ResultVo.success();
}
-
+ String cycel = null;
+ String custEndTime = null;
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ cycel = feeDto.getCycle();
+ }
+ if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
+ custEndTime = feeDto.getCustEndTime();
+ }
feeDto = feeDtos.get(0);
+ if (!StringUtil.isEmpty(cycel)) {
+ feeDto.setCycle(cycel);
+ }
+ if (!StringUtil.isEmpty(custEndTime)) {
+ feeDto.setCustEndTime(custEndTime);
+ }
if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
RoomDto roomDto = new RoomDto();
@@ -153,17 +181,42 @@
feeDto.setPayerObjName(ownerCarDto.getCarNum() + "(" + parkingSpaceDto.getAreaNum() + "鍋滆溅鍦�" + parkingSpaceDto.getNum() + "杞︿綅)");
feeDto.setBuiltUpArea(parkingSpaceDto.getArea());
}
- double feePrice = computeFeeSMOImpl.getFeePrice(feeDto);
- feeDto.setFeePrice(feePrice);
+ Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
+ feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
+ feeDto.setFeeTotalPrice(Double.parseDouble(feePriceAll.get("feeTotalPrice").toString()));
+
+ if (!StringUtil.isEmpty(custEndTime)) {
+ Date date = DateUtil.getDateFromStringB(custEndTime);
+ computeFeeSMOImpl.dealRentRateCustEndTime(feeDto, date);
+ } else {
+ computeFeeSMOImpl.dealRentRateCycle(feeDto, NumberUtil.getDouble(feeDto.getCycle()));
+ }
+
+
//搴旀敹娆惧彇鍊�
- String val = MappingCache.getValue(DOMAIN_COMMON, TOTAL_FEE_PRICE);
+ //鍏堝彇鍗曞皬鍖虹殑濡傛灉娌℃湁閰嶇疆 鍙� 鍏ㄥ眬鐨�
+ String val = CommunitySettingFactory.getValue(feeDto.getCommunityId(), TOTAL_FEE_PRICE);
+ if (StringUtil.isEmpty(val)) {
+ val = MappingCache.getValue(DOMAIN_COMMON, TOTAL_FEE_PRICE);
+ }
feeDto.setVal(val);
- String received_amount_switch = MappingCache.getValue(DOMAIN_COMMON, RECEIVED_AMOUNT_SWITCH);
+ //鍏堝彇鍗曞皬鍖虹殑濡傛灉娌℃湁閰嶇疆 鍙� 鍏ㄥ眬鐨�
+ String received_amount_switch = CommunitySettingFactory.getValue(feeDto.getCommunityId(), RECEIVED_AMOUNT_SWITCH);
+ if (StringUtil.isEmpty(received_amount_switch)) {
+ 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);
}
+ //鍏堝彇鍗曞皬鍖虹殑濡傛灉娌℃湁閰嶇疆 鍙� 鍏ㄥ眬鐨�
+ String offlinePayFeeSwitch = CommunitySettingFactory.getValue(feeDto.getCommunityId(), OFFLINE_PAY_FEE_SWITCH);
+ if (StringUtil.isEmpty(offlinePayFeeSwitch)) {
+ offlinePayFeeSwitch = MappingCache.getValue(DOMAIN_COMMON, OFFLINE_PAY_FEE_SWITCH);
+ }
+ feeDto.setOfflinePayFeeSwitch(offlinePayFeeSwitch);
return ResultVo.createResponseEntity(feeDto);
}
@@ -228,7 +281,8 @@
computeFeeSMOImpl.computeEveryOweFee(tempFeeDto, tmpRoomDto);//璁＄畻娆犺垂閲戦
//濡傛灉閲戦涓�0 灏辨帓闄�
- if (tempFeeDto.getFeePrice() > 0 && tempFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+ //if (tempFeeDto.getFeePrice() > 0 && tempFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+ if (tempFeeDto.getFeePrice() > 0) {
tmpFeeDtos.add(tempFeeDto);
}
}
@@ -407,6 +461,8 @@
feePrice = 0.0;
} else if ("1101".equals(computingFormula)) { // 绉熼噾
feePrice = 0.0;
+ } else if ("1102".equals(computingFormula)) { // 绉熼噾
+ feePrice = 0.0;
} else if ("4004".equals(computingFormula)) {
feePrice = Double.parseDouble(feeDto.getAmount());
} else if ("5005".equals(computingFormula)) {
@@ -526,6 +582,9 @@
} else if ("1101".equals(computingFormula)) { // 绉熼噾
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpRoomDto.getRoomRent()));
feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ } else if ("1102".equals(computingFormula)) { // 绉熼噾
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpRoomDto.getRoomRent()));
+ feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
} else if ("4004".equals(computingFormula)) {
feePrice = Double.parseDouble(feeDto.getAmount());
} else if ("5005".equals(computingFormula)) {
--
Gitblit v1.8.0