Lianxun_Java.git

			@@ -1,14 +1,17 @@
			package com.java110.core.smo.impl;

			import com.alibaba.fastjson.JSONObject;
			import com.java110.config.properties.code.Java110Properties;
			import com.java110.core.context.Environment;
			import com.java110.core.log.LoggerFactory;
			import com.java110.core.smo.IComputeFeeSMO;
			import com.java110.dto.RoomDto;
			import com.java110.dto.room.RoomAttrDto;
			import com.java110.dto.room.RoomDto;
			import com.java110.dto.community.CommunityDto;
			import com.java110.dto.contract.ContractDto;
			import com.java110.dto.contractRoom.ContractRoomDto;
			import com.java110.dto.contract.ContractRoomDto;
			import com.java110.dto.fee.*;
			import com.java110.dto.integral.IntegralRuleConfigDto;
			import com.java110.dto.machine.CarInoutDetailDto;
			import com.java110.dto.machine.CarInoutDto;
			import com.java110.dto.owner.OwnerCarDto;
			@@ -28,13 +31,11 @@
			import com.java110.intf.store.IContractRoomInnerServiceSMO;
			import com.java110.intf.user.IOwnerCarInnerServiceSMO;
			import com.java110.intf.user.IOwnerInnerServiceSMO;
			import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
			import com.java110.po.fee.FeeReceiptDetailPo;
			import com.java110.utils.constant.FeeConfigConstant;
			import com.java110.utils.constant.ResponseConstant;
			import com.java110.utils.exception.ListenerExecuteException;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.BeanConvertUtil;
			import com.java110.utils.util.DateUtil;
			import com.java110.utils.util.StringUtil;
			import com.java110.utils.util.*;
			import org.slf4j.Logger;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			@@ -42,12 +43,10 @@
			import javax.script.ScriptEngine;
			import javax.script.ScriptEngineManager;
			import java.math.BigDecimal;
			import java.text.DateFormat;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.time.LocalDate;
			import java.time.ZoneId;
			import java.time.format.DateTimeFormatter;
			import java.util.*;

			/**
			@@ -118,6 +117,46 @@
			computeFeePrice(tmpFeeDto, roomDto);
			}

			/**
			* 设定结束时间
			*
			* @param feeDto
			* @param targetEndTime
			*/
			@Override
			public void computeEveryOweFeeByTargetEndTime(FeeDto feeDto, String targetEndTime) {

			Date targetEndDate = DateUtil.getDateFromStringB(targetEndTime);
			double oweMonth = 1.0;
			if (feeDto.getEndTime().getTime() > targetEndDate.getTime()) {
			targetEndDate = feeDto.getEndTime();
			}
			if (feeDto.getEndTime().getTime() < targetEndDate.getTime()) {
			// 目标到期时间 - 到期时间 = 欠费月份
			oweMonth = DateUtil.dayCompare(feeDto.getEndTime(), targetEndDate);
			}

			String computingFormula = feeDto.getComputingFormula();
			Map feePriceAll = getFeePrice(feeDto, null);
			feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));

			BigDecimal price = new BigDecimal(feeDto.getFeePrice());
			price = price.multiply(new BigDecimal(oweMonth));
			feeDto.setFeeTotalPrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
			feeDto.setDeadlineTime(targetEndDate);

			//动态费用
			if ("4004".equals(computingFormula)
			&& FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
			&& !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
			feeDto.setAmountOwed(feeDto.getFeeTotalPrice() + "");
			//feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
			}

			//todo 考虑租金递增
			dealRentRate(feeDto);
			}


			/**
			* 计算欠费金额
			@@ -159,54 +198,6 @@
			}

			private void computeFeePrice(FeeDto feeDto, RoomDto roomDto) {

			if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //房屋相关
			computeFeePriceByRoom(feeDto, roomDto);
			} else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//车位相关
			computeFeePriceByParkingSpace(feeDto);
			} else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeDto.getPayerObjType())) { //房屋相关
			computeFeePriceByContract(feeDto, roomDto);
			}
			}

			private void computeFeePriceByParkingSpace(FeeDto feeDto) {
			Map<String, Object> targetEndDateAndOweMonth = getTargetEndDateAndOweMonth(feeDto);
			Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
			double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
			OwnerCarDto ownerCarDto = new OwnerCarDto();
			ownerCarDto.setCommunityId(feeDto.getCommunityId());
			ownerCarDto.setCarId(feeDto.getPayerObjId());
			List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);

			if (ownerCarDtos == null \|\| ownerCarDtos.size() < 1) { //数据有问题
			return;
			}

			String computingFormula = feeDto.getComputingFormula();
			Map feePriceAll = getFeePrice(feeDto);

			feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
			BigDecimal price = new BigDecimal(feeDto.getFeePrice());
			price = price.multiply(new BigDecimal(oweMonth));
			feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
			feeDto.setDeadlineTime(targetEndDate);

			//动态费用
			if ("4004".equals(computingFormula)
			&& FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
			&& !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
			feeDto.setAmountOwed(feeDto.getFeePrice() + "");
			//feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
			}

			}

			/**
			* 根据房屋来算单价
			*
			* @param feeDto
			*/
			private void computeFeePriceByRoom(FeeDto feeDto, RoomDto roomDto) {
			Map<String, Object> targetEndDateAndOweMonth = getTargetEndDateAndOweMonth(feeDto);
			Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
			double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
			@@ -214,47 +205,22 @@
			String computingFormula = feeDto.getComputingFormula();
			Map feePriceAll = getFeePrice(feeDto, roomDto);
			feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
			//double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());

			BigDecimal price = new BigDecimal(feeDto.getFeePrice());
			price = price.multiply(new BigDecimal(oweMonth));
			feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
			feeDto.setFeeTotalPrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
			feeDto.setDeadlineTime(targetEndDate);

			//动态费用
			if ("4004".equals(computingFormula)
			&& FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
			&& !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
			feeDto.setAmountOwed(feeDto.getFeePrice() + "");
			feeDto.setAmountOwed(feeDto.getFeeTotalPrice() + "");
			//feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
			}
			}

			/**
			* 根据房屋来算单价
			*
			* @param feeDto
			*/
			private void computeFeePriceByContract(FeeDto feeDto, RoomDto roomDto) {
			Map<String, Object> targetEndDateAndOweMonth = getTargetEndDateAndOweMonth(feeDto);
			Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
			double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");

			String computingFormula = feeDto.getComputingFormula();
			Map feePriceAll = getFeePrice(feeDto, roomDto);
			feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
			//double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
			BigDecimal price = new BigDecimal(feeDto.getFeePrice());
			price = price.multiply(new BigDecimal(oweMonth));
			feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
			feeDto.setDeadlineTime(targetEndDate);

			//动态费用
			if ("4004".equals(computingFormula)
			&& FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
			&& !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
			feeDto.setAmountOwed(feeDto.getFeePrice() + "");
			//feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
			}
			//todo 考虑租金递增
			dealRentRate(feeDto);
			}


			@@ -287,7 +253,7 @@
			} else if ("1101".equals(computingFormula)) { // 租金
			feeReceiptDetailPo.setArea("");
			feeReceiptDetailPo.setSquarePrice(roomDto.getRoomRent());
			} else if ("1102".equals(computingFormula)) { // 租金
			} else if ("1102".equals(computingFormula)) { // 租金
			feeReceiptDetailPo.setArea("");
			feeReceiptDetailPo.setSquarePrice(roomDto.getRoomRent());
			} else if ("4004".equals(computingFormula)) {
			@@ -328,13 +294,14 @@
			} else if ("1102".equals(computingFormula)) { //租金
			feeReceiptDetailPo.setArea(roomDtos.get(0).getBuiltUpArea());
			feeReceiptDetailPo.setSquarePrice(roomDtos.get(0).getRoomRent());
			}else {
			} else {
			}
			} else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//车位相关
			String computingFormula = feeDto.getComputingFormula();
			OwnerCarDto ownerCarDto = new OwnerCarDto();
			ownerCarDto.setCommunityId(feeDto.getCommunityId());
			ownerCarDto.setCarId(feeDto.getPayerObjId());
			ownerCarDto.setCarTypeCd(OwnerCarDto.CAR_TYPE_PRIMARY);
			List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
			Assert.listOnlyOne(ownerCarDtos, "未找到车辆信息");
			if ("1001".equals(computingFormula)) { //面积*单价+附加费
			@@ -443,7 +410,7 @@
			}
			feeReceiptDetailPo.setArea("");
			feeReceiptDetailPo.setSquarePrice(builtUpArea.doubleValue() + "");
			}else if ("4004".equals(computingFormula)) {
			} else if ("4004".equals(computingFormula)) {
			} else if ("5005".equals(computingFormula)) {
			if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
			} else {
			@@ -763,7 +730,7 @@
			endCalender.add(Calendar.HOUR, hours);
			if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
			return FeeDto.STATE_FINISH;
			} else if(FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())){
			} else if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())) {
			if ((endCalender.getTime()).after(feeDto.getDeadlineTime())) {
			return FeeDto.STATE_FINISH;
			}
			@@ -782,9 +749,6 @@
			Calendar endCalender = Calendar.getInstance();
			endCalender.setTime(endTime);
			endCalender.add(Calendar.MONTH, new Double(Math.floor(cycle)).intValue());
			// Calendar futureDate = Calendar.getInstance();
			// futureDate.setTime(endCalender.getTime());
			// futureDate.add(Calendar.MONTH, 1);
			int futureDay = endCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
			int hours = new Double((cycle - Math.floor(cycle)) * futureDay * 24).intValue();
			endCalender.add(Calendar.HOUR, hours);
			@@ -798,7 +762,10 @@
			} else {
			endCalender.setTime(feeDto.getImportFeeEndTime());
			}
			} else if(FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())){
			} else if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())) {
			if (feeDto.getDeadlineTime() == null) {
			throw new IllegalArgumentException("间接性费用未设置结束时间");
			}
			if ((endCalender.getTime()).after(feeDto.getDeadlineTime())) {
			endCalender.setTime(feeDto.getDeadlineTime());
			}
			@@ -828,22 +795,22 @@
			BigDecimal squarePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getSquarePrice()));
			BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(reportRoomDto.getBuiltUpArea()));
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			} else if ("2002".equals(computingFormula)) { // 固定费用
			//feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAdditionalAmount()));
			feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			} else if ("3003".equals(computingFormula)) { // 固定费用
			BigDecimal squarePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getSquarePrice()));
			BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getRoomArea()));
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			} else if ("1101".equals(computingFormula)) { // 租金
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getRoomRent()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			} else if ("1102".equals(computingFormula)) { // 租金
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			} else if ("1102".equals(computingFormula)) { // 租金
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getRoomRent()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			} else if ("4004".equals(computingFormula)) {
			feePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAmount()));
			} else if ("5005".equals(computingFormula)) {
			@@ -857,7 +824,7 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("6006".equals(computingFormula)) {
			feePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAmount()));
			@@ -874,7 +841,7 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else {
			throw new IllegalArgumentException("暂不支持该类公式");
			@@ -886,19 +853,19 @@
			BigDecimal squarePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getSquarePrice()));
			BigDecimal builtUpArea = new BigDecimal(Double.parseDouble("0"));
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			} else if ("2002".equals(computingFormula)) { // 固定费用
			//feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAdditionalAmount()));
			feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			} else if ("3003".equals(computingFormula)) { // 固定费用
			//feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
			feePrice = new BigDecimal(0);
			} else if ("1101".equals(computingFormula)) { // 租金
			feePrice = new BigDecimal(0);
			} else if ("1102".equals(computingFormula)) { // 租金
			} else if ("1102".equals(computingFormula)) { // 租金
			feePrice = new BigDecimal(0);
			}else if ("4004".equals(computingFormula)) {
			} else if ("4004".equals(computingFormula)) {
			feePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAmount()));
			} else if ("5005".equals(computingFormula)) {
			if (StringUtil.isEmpty(tmpReportFeeDto.getCurDegrees())) {
			@@ -911,7 +878,7 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("6006".equals(computingFormula)) {
			feePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAmount()));
			@@ -928,13 +895,13 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else {
			throw new IllegalArgumentException("暂不支持该类公式");
			}
			}
			return feePrice.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
			return feePrice.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP).doubleValue();
			}

			@Override
			@@ -942,44 +909,8 @@
			return getFeePrice(feeDto, null);
			}

			/**
			* //计算周期
			// Map<String, Object> cycleResults = dateDiff(feeDto.getEndTime(), feeDto.getCustEndTime());
			// //月份大于0
			// Integer months = Integer.valueOf(cycleResults.get("months").toString());
			// Integer days = Integer.valueOf(cycleResults.get("days").toString());
			// Integer startMonthDays = Integer.valueOf(cycleResults.get("startMonthDays").toString());
			// Integer endMonthDays = Integer.valueOf(cycleResults.get("endMonthDays").toString());
			// String isOneMonth = cycleResults.get("isOneMonth").toString();
			// //整数月
			// if (months > 0 && days == 0) {
			// BigDecimal cycle = new BigDecimal(months);
			// feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			// }
			// //几个月几天（单价面积+附加费）月份+((单价面积+附加费)/总天数)实际天数
			// if (months > 0 && days > 0) {
			// BigDecimal cycle = new BigDecimal(months);
			// BigDecimal endMonthDayss = new BigDecimal(endMonthDays);
			// BigDecimal dayss = new BigDecimal(days);
			// BigDecimal monthPrice = squarePrice.multiply(builtUpArea).add(additionalAmount);
			// feeTotalPrice = (monthPrice).multiply(cycle).add(monthPrice.divide(endMonthDayss).multiply(dayss)).setScale(3, BigDecimal.ROUND_HALF_UP);
			// }
			// //跨月份不足一月 ((单价面积+附加费)/开始月份总天数)实际天数+((单价面积+附加费)/结束月份总天数)实际天数
			// if (months == 0 && days > 0 && "true".equals(isOneMonth)) {
			// BigDecimal startEndOfMonth = new BigDecimal(cycleResults.get("startEndOfMonth").toString());
			// BigDecimal endBeginningOfMonth = new BigDecimal(cycleResults.get("endBeginningOfMonth").toString());
			// BigDecimal endMonthDayss = new BigDecimal(endMonthDays);
			// BigDecimal startMonthDayss = new BigDecimal(startMonthDays);
			// BigDecimal monthPrice = squarePrice.multiply(builtUpArea).add(additionalAmount);
			// feeTotalPrice = monthPrice.divide(startMonthDayss, 4, BigDecimal.ROUND_HALF_UP).multiply(startEndOfMonth).add(monthPrice.divide(endMonthDayss, 4, BigDecimal.ROUND_HALF_UP).multiply(endBeginningOfMonth)).setScale(3, BigDecimal.ROUND_HALF_UP);
			// }
			// //不跨月份不足一月 (单价面积+附加费/开始月份总天数)实际天数
			// if (months == 0 && days > 0 && "false".equals(isOneMonth)) {
			// BigDecimal cycle = new BigDecimal(days);
			// BigDecimal startMonthDayss = new BigDecimal(startMonthDays);
			// BigDecimal monthPrice = squarePrice.multiply(builtUpArea).add(additionalAmount);
			// feeTotalPrice = monthPrice.divide(startMonthDayss, 4, BigDecimal.ROUND_HALF_UP).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			// }
			/*
			*
			* @param feeDto
			* @param roomDto
			* @return
			@@ -992,6 +923,18 @@
			if (Environment.isOwnerPhone(java110Properties)) {
			return getOwnerPhoneFee(feeAmount);
			}

			//todo 如果 cycle 为105 则根据缴费时间段改写下
			if ("105".equals(feeDto.getCycle())) {
			double cycle = DateUtil.dayCompare(DateUtil.getDateFromStringB(feeDto.getCustomStartTime()), DateUtil.getDateFromStringB(feeDto.getCustomEndTime()));
			feeDto.setCycle(cycle + "");
			}
			// todo 按结束时间缴费
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			double cycle = DateUtil.dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime()));
			feeDto.setCycle(cycle + "");
			}

			if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //房屋相关
			String computingFormula = feeDto.getComputingFormula();
			if (roomDto == null) {
			@@ -1009,81 +952,66 @@
			BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
			BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(roomDto.getBuiltUpArea()));
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("2002".equals(computingFormula)) { // 固定费用
			//feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("3003".equals(computingFormula)) { // 固定费用
			BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
			BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(roomDto.getRoomArea()));
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("1101".equals(computingFormula)) { // 租金
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}else if ("1102".equals(computingFormula)) { // 租金
			} else if ("1102".equals(computingFormula)) { // 租金
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("4004".equals(computingFormula)) { //动态费用
			feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
			@@ -1091,13 +1019,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("5005".equals(computingFormula)) { //(本期度数-上期度数)*单价+附加费
			if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
			@@ -1110,19 +1035,16 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}
			} else if ("6006".equals(computingFormula)) {
			@@ -1132,27 +1054,31 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("7007".equals(computingFormula)) { //自定义公式
			if (roomDto == null) {
			roomDto = new RoomDto();
			roomDto.setRoomId(feeDto.getPayerObjId());
			roomDto.setCommunityId(feeDto.getCommunityId());
			List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
			if (roomDtos == null \|\| roomDtos.size() != 1) {
			throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到房屋信息，查询多条数据 roomId=" + feeDto.getPayerObjId());
			}
			roomDto = roomDtos.get(0);
			}
			feePrice = computeRoomCustomizeFormula(feeDto, roomDto);
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("8008".equals(computingFormula)) { //手动动态费用
			feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
			@@ -1160,13 +1086,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("9009".equals(computingFormula)) { //(本期度数-上期度数)*动态单价+附加费
			if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
			@@ -1184,13 +1107,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}
			} else {
			@@ -1216,99 +1136,81 @@
			BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
			BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(parkingSpaceDtos.get(0).getArea()));
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("2002".equals(computingFormula)) { // 固定费用
			//feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(4, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("3003".equals(computingFormula)) { // 固定费用
			BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
			BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(roomDto.getRoomArea()));
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("1101".equals(computingFormula)) { // 租金
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("1102".equals(computingFormula)) { // 租金
			} else if ("1102".equals(computingFormula)) { // 租金
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}else if ("4004".equals(computingFormula)) {
			} else if ("4004".equals(computingFormula)) {
			feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("5005".equals(computingFormula)) {
			if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
			@@ -1321,19 +1223,16 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}
			} else if ("6006".equals(computingFormula)) {
			@@ -1343,13 +1242,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("7007".equals(computingFormula)) { //自定义公式
			feePrice = computeCarCustomizeFormula(feeDto, ownerCarDtos.get(0));
			@@ -1358,13 +1254,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("9009".equals(computingFormula)) { //(本期度数-上期度数)*动态单价+附加费
			if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
			@@ -1377,19 +1270,16 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}
			} else {
			@@ -1413,87 +1303,72 @@
			}
			feeDto.setBuiltUpArea(builtUpArea.doubleValue() + "");
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("2002".equals(computingFormula)) { // 固定费用
			//feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			// BigDecimal roomDount = new BigDecimal(contractRoomDtos.size());
			// additionalAmount = additionalAmount.multiply(roomDount);
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("3003".equals(computingFormula)) { // 固定费用
			BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
			BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(roomDto.getRoomArea()));
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("1101".equals(computingFormula)) { // 租金
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}else if ("1102".equals(computingFormula)) { // 租金
			} else if ("1102".equals(computingFormula)) { // 租金
			BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
			feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
			feePrice = additionalAmount.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = additionalAmount.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("4004".equals(computingFormula)) { //动态费用
			feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
			@@ -1502,13 +1377,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("5005".equals(computingFormula)) { //(本期度数-上期度数)*单价+附加费
			if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
			@@ -1521,20 +1393,17 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);


			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}
			} else if ("6006".equals(computingFormula)) {
			@@ -1544,13 +1413,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("7007".equals(computingFormula)) { //自定义公式
			feePrice = computeContractCustomizeFormula(feeDto, contractRoomDtos);
			@@ -1559,13 +1425,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("8008".equals(computingFormula)) { //手动动态费用
			feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
			@@ -1574,13 +1437,10 @@
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = feePrice.multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			} else if ("9009".equals(computingFormula)) { //(本期度数-上期度数)*动态单价+附加费
			if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
			@@ -1593,19 +1453,16 @@
			BigDecimal sub = curDegree.subtract(preDegree);
			feePrice = sub.multiply(squarePrice)
			.add(additionalAmount)
			.setScale(2, BigDecimal.ROUND_HALF_UP);
			.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			BigDecimal cycle = null;
			if (!StringUtil.isEmpty(feeDto.getCycle())) {
			cycle = new BigDecimal(feeDto.getCycle());
			}
			if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
			cycle = new BigDecimal(dayCompare(feeDto.getEndTime(), DateUtil.getDateFromStringB(feeDto.getCustEndTime())));
			}
			if(cycle == null){
			if (cycle == null) {
			feeTotalPrice = new BigDecimal(0);
			}else {
			feeTotalPrice = sub.multiply(squarePrice).add(additionalAmount).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
			} else {
			feeTotalPrice = sub.multiply(squarePrice).add(additionalAmount).multiply(cycle).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			}
			}
			} else {
			@@ -1613,7 +1470,7 @@
			}
			}

			feePrice.setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
			feePrice.setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP).doubleValue();
			feeAmount.put("feePrice", feePrice);
			feeAmount.put("feeTotalPrice", feeTotalPrice);
			return feeAmount;
			@@ -1709,6 +1566,11 @@
			private BigDecimal computeRoomCustomizeFormula(FeeDto feeDto, RoomDto roomDto) {

			String value = feeDto.getComputingFormulaText();

			if (StringUtil.isEmpty(value)) {
			return new BigDecimal(0);
			}

			value = value.replace("\n", "")
			.replace("\r", "")
			.trim();
			@@ -1722,26 +1584,41 @@
			} else {
			value = value.replace("C", communityDtos.get(0).getCommunityArea());
			}
			} else if (value.contains("F")) { //处理楼栋
			}
			if (value.contains("F")) { //处理楼栋
			value = value.replace("F", roomDto.getFloorArea());
			} else if (value.contains("U")) { //处理单元
			}
			if (value.contains("U")) { //处理单元
			value = value.replace("U", roomDto.getUnitArea());
			} else if (value.contains("R")) { //处理房屋面积
			}
			if (value.contains("RL")) {
			List<RoomAttrDto> roomAttrDtos = roomDto.getRoomAttrDto();
			if (roomAttrDtos != null && roomAttrDtos.size() > 0) {
			for (RoomAttrDto roomAttrDto : roomAttrDtos) {
			value = value.replace("RL" + roomAttrDto.getSpecCd(), roomAttrDto.getValue());
			}
			}
			}
			if (value.contains("R")) { //处理房屋面积
			value = value.replace("R", roomDto.getBuiltUpArea());
			} else if (value.contains("X")) {// 处理房屋系数
			}
			if (value.contains("X")) {// 处理房屋系数
			value = value.replace("X", roomDto.getFeeCoefficient());
			} else if (value.contains("L")) {//处理房屋层数
			}
			if (value.contains("L")) {//处理房屋层数
			value = value.replace("L", roomDto.getLayer());
			}

			ScriptEngineManager manager = new ScriptEngineManager();
			ScriptEngine engine = manager.getEngineByName("JavaScript");
			BigDecimal valueObj = null;
			logger.debug("计算公式为：{}", value);
			try {
			value = engine.eval(value).toString();
			valueObj = new BigDecimal(Double.parseDouble(value));
			} catch (Exception e) {
			//throw new IllegalArgumentException("公式计算异常，公式为【" + feeDto.getComputingFormulaText() + "】,计算【" + value + "】异常");
			logger.error("公式计算异常，公式为【" + feeDto.getComputingFormulaText() + "】,计算【" + value + "】异常", e);
			valueObj = new BigDecimal(0);
			}

			@@ -1751,6 +1628,12 @@

			return valueObj;

			}

			@Override
			public Date getDeadlineTime(FeeDto feeDto) {
			Map info = getTargetEndDateAndOweMonth(feeDto);
			return (Date) info.get("targetEndDate");
			}

			/**
			@@ -1765,15 +1648,27 @@
			double oweMonth = 0.0;

			Map<String, Object> targetEndDateAndOweMonth = new HashMap<>();
			//判断当前费用是否已结束
			//todo 判断当前费用是否已结束
			if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
			targetEndDate = feeDto.getEndTime();
			targetEndDateAndOweMonth.put("oweMonth", oweMonth);
			targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
			return targetEndDateAndOweMonth;
			}
			//当前费用为一次性费用
			Date maxEndTime = feeDto.getConfigEndTime();

			//todo 考虑费用项费用提前生成
			Calendar preEndTimeCal = Calendar.getInstance();
			preEndTimeCal.setTime(feeDto.getEndTime());
			if (StringUtil.isNumber(feeDto.getPrepaymentPeriod())) {
			preEndTimeCal.add(Calendar.DAY_OF_MONTH, Integer.parseInt(feeDto.getPrepaymentPeriod()) * -1);
			}
			Date preEndTime = preEndTimeCal.getTime();

			//todo 当前费用为一次性费用
			Date maxEndTime = feeDto.getDeadlineTime();
			if (maxEndTime == null) {
			maxEndTime = feeDto.getConfigEndTime();
			}
			if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
			//先取 deadlineTime
			if (feeDto.getDeadlineTime() != null) {
			@@ -1785,12 +1680,17 @@
			} else {
			targetEndDate = feeDto.getImportFeeEndTime();
			}
			//判断当前费用是不是导入费用
			oweMonth = 1.0;
			}else if(FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())){
			if(feeDto.getDeadlineTime() != null) {
			maxEndTime = feeDto.getDeadlineTime();
			//说明欠费
			if (preEndTime.getTime() <= DateUtil.getCurrentDate().getTime()) {
			// 目标到期时间 - 到期时间 = 欠费月份
			oweMonth = 1.0;
			}

			//todo 这里考虑账单模式的场景
			if (StringUtil.isNumber(feeDto.getMonthCycle())) {
			oweMonth = Integer.parseInt(feeDto.getMonthCycle());
			}
			} else {
			Date billEndTime = DateUtil.getCurrentDate();
			//建账时间
			Date startDate = feeDto.getStartTime();
			@@ -1800,7 +1700,7 @@
			long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
			// 当前时间 - 开始时间 = 月份
			double mulMonth = 0.0;
			mulMonth = dayCompare(startDate, billEndTime);
			mulMonth = DateUtil.dayCompare(startDate, billEndTime);

			// 月份/ 周期 = 轮数（向上取整）
			double round = 0.0;
			@@ -1811,49 +1711,22 @@
			}
			// 轮数 * 周期 * 30 + 开始时间 = 目标到期时间
			targetEndDate = getTargetEndTime(round * paymentCycle, startDate);//目标结束时间
			//费用项的结束时间<缴费的结束时间费用快结束了取费用项的结束时间

			//todo 如果到了预付期产生下个周期的费用
			if (DateUtil.getFormatTimeStringB(targetEndDate).equals(DateUtil.getFormatTimeStringB(endDate))
			&& DateUtil.getCurrentDate().getTime() > preEndTime.getTime()
			) {
			targetEndDate = getTargetEndTime((round + 1) * paymentCycle, startDate);//目标结束时间
			}

			//todo 费用项的结束时间<缴费的结束时间费用快结束了取费用项的结束时间
			if (maxEndTime.getTime() < targetEndDate.getTime()) {
			targetEndDate = maxEndTime;
			}
			//说明欠费
			if (endDate.getTime() < targetEndDate.getTime()) {
			// 目标到期时间 - 到期时间 = 欠费月份
			oweMonth = dayCompare(endDate, targetEndDate);
			}

			if (feeDto.getEndTime().getTime() > targetEndDate.getTime()) {
			targetEndDate = feeDto.getEndTime();
			}
			} else { //周期性费用
			//当前时间
			Date billEndTime = DateUtil.getCurrentDate();
			//建账时间
			Date startDate = feeDto.getStartTime();
			//计费起始时间
			Date endDate = feeDto.getEndTime();
			//缴费周期
			long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
			// 当前时间 - 开始时间 = 月份
			double mulMonth = 0.0;
			mulMonth = dayCompare(startDate, billEndTime);

			// 月份/ 周期 = 轮数（向上取整）
			double round = 0.0;
			if ("1200".equals(feeDto.getPaymentCd())) { // 1200预付费
			round = Math.floor(mulMonth / paymentCycle) + 1;
			} else { //2100后付费
			round = Math.floor(mulMonth / paymentCycle);
			}
			// 轮数 * 周期 * 30 + 开始时间 = 目标到期时间
			targetEndDate = getTargetEndTime(round * paymentCycle, startDate);//目标结束时间
			//费用项的结束时间<缴费的结束时间费用快结束了取费用项的结束时间
			if (maxEndTime.getTime() < targetEndDate.getTime()) {
			targetEndDate = maxEndTime;
			}
			//说明欠费
			if (endDate.getTime() < targetEndDate.getTime()) {
			// 目标到期时间 - 到期时间 = 欠费月份
			oweMonth = dayCompare(endDate, targetEndDate);
			oweMonth = DateUtil.dayCompare(endDate, targetEndDate, true);
			}

			if (feeDto.getEndTime().getTime() > targetEndDate.getTime()) {
			@@ -1867,79 +1740,72 @@
			}

			public Map getTargetEndDateAndOweMonth(FeeDto feeDto) {

			// if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
			// OwnerCarDto ownerCarDto = new OwnerCarDto();
			// ownerCarDto.setCommunityId(feeDto.getCommunityId());
			// ownerCarDto.setCarId(feeDto.getPayerObjId());
			// List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
			// return getTargetEndDateAndOweMonth(feeDto, ownerCarDtos == null \|\| ownerCarDtos.size() < 1 ? null : ownerCarDtos.get(0));
			// }
			return getTargetEndDateAndOweMonth(feeDto, null);
			}

			/**
			* 计算两个时间点月份
			*
			* @param fromDate 开始时间
			* @param toDate 结束时间
			* @return
			*/
			@Override
			public double dayCompare(Date fromDate, Date toDate) {
			double resMonth = 0.0;
			Calendar from = Calendar.getInstance();
			from.setTime(fromDate);
			Calendar to = Calendar.getInstance();
			to.setTime(toDate);
			//比较月份差可能有整数也会负数
			int result = to.get(Calendar.MONTH) - from.get(Calendar.MONTH);
			//比较年差
			int month = (to.get(Calendar.YEAR) - from.get(Calendar.YEAR)) * 12;

			//真实相差月份
			result = result + month;

			//开始时间 2021-06-01 2021-08-05 result = 2 2021-08-01
			Calendar newFrom = Calendar.getInstance();
			newFrom.setTime(fromDate);
			newFrom.add(Calendar.MONTH, result);
			//如果加月份后大于了当前时间默认加月份 -1 情况 12-19 21-01-10
			//这个是神的逻辑一定好好理解
			if (newFrom.getTime().getTime() > toDate.getTime()) {
			newFrom.setTime(fromDate);
			result = result - 1;
			newFrom.add(Calendar.MONTH, result);
			}

			// t1 2021-08-01 t2 2021-08-05
			long t1 = newFrom.getTime().getTime();
			long t2 = to.getTime().getTime();
			//相差毫秒
			double days = (t2 - t1) * 1.00 / (24 * 60 * 60 * 1000);
			BigDecimal tmpDays = new BigDecimal(days); //相差天数
			BigDecimal monthDay = null;
			Calendar newFromMaxDay = Calendar.getInstance();
			newFromMaxDay.set(newFrom.get(Calendar.YEAR), newFrom.get(Calendar.MONTH), 1, 0, 0, 0);
			newFromMaxDay.add(Calendar.MONTH, 1); //下个月1号
			//在当前月中这块有问题
			if (toDate.getTime() < newFromMaxDay.getTime().getTime()) {
			monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
			return tmpDays.divide(monthDay, 2, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).doubleValue();
			}
			// 上月天数
			days = (newFromMaxDay.getTimeInMillis() - t1) * 1.00 / (24 * 60 * 60 * 1000);
			tmpDays = new BigDecimal(days);
			monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
			BigDecimal preRresMonth = tmpDays.divide(monthDay, 2, BigDecimal.ROUND_HALF_UP);

			//下月天数
			days = (t2 - newFromMaxDay.getTimeInMillis()) * 1.00 / (24 * 60 * 60 * 1000);
			tmpDays = new BigDecimal(days);
			monthDay = new BigDecimal(newFromMaxDay.getActualMaximum(Calendar.DAY_OF_MONTH));
			resMonth = tmpDays.divide(monthDay, 2, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).add(preRresMonth).doubleValue();
			return resMonth;
			}
			// /**
			// * 计算两个时间点月份
			// *
			// * @param fromDate 开始时间
			// * @param toDate 结束时间
			// * @return
			// */
			//
			// public double dayCompareOld(Date fromDate, Date toDate) {
			// double resMonth = 0.0;
			// Calendar from = Calendar.getInstance();
			// from.setTime(fromDate);
			// Calendar to = Calendar.getInstance();
			// to.setTime(toDate);
			// //比较月份差可能有整数也会负数
			// int result = to.get(Calendar.MONTH) - from.get(Calendar.MONTH);
			// //比较年差
			// int month = (to.get(Calendar.YEAR) - from.get(Calendar.YEAR)) * 12;
			//
			// //真实相差月份
			// result = result + month;
			//
			// //开始时间 2021-06-01 2021-08-05 result = 2 2021-08-01
			// Calendar newFrom = Calendar.getInstance();
			// newFrom.setTime(fromDate);
			// newFrom.add(Calendar.MONTH, result);
			// //如果加月份后大于了当前时间默认加月份 -1 情况 12-19 21-01-10
			// //这个是神的逻辑一定好好理解
			// if (newFrom.getTime().getTime() > toDate.getTime()) {
			// newFrom.setTime(fromDate);
			// result = result - 1;
			// newFrom.add(Calendar.MONTH, result);
			// }
			//
			// // t1 2021-08-01 t2 2021-08-05
			// long t1 = newFrom.getTime().getTime();
			// long t2 = to.getTime().getTime();
			// //相差毫秒
			// double days = (t2 - t1) * 1.00 / (24 * 60 * 60 * 1000);
			// BigDecimal tmpDays = new BigDecimal(days); //相差天数
			// BigDecimal monthDay = null;
			// Calendar newFromMaxDay = Calendar.getInstance();
			// newFromMaxDay.set(newFrom.get(Calendar.YEAR), newFrom.get(Calendar.MONTH), 1, 0, 0, 0);
			// newFromMaxDay.add(Calendar.MONTH, 1); //下个月1号
			// //在当前月中这块有问题
			// if (toDate.getTime() < newFromMaxDay.getTime().getTime()) {
			// monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
			// return tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).doubleValue();
			// }
			// // 上月天数
			// days = (newFromMaxDay.getTimeInMillis() - t1) * 1.00 / (24 * 60 * 60 * 1000);
			// tmpDays = new BigDecimal(days);
			// monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
			// BigDecimal preRresMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP);
			//
			// //下月天数
			// days = (t2 - newFromMaxDay.getTimeInMillis()) * 1.00 / (24 * 60 * 60 * 1000);
			// tmpDays = new BigDecimal(days);
			// monthDay = new BigDecimal(newFromMaxDay.getActualMaximum(Calendar.DAY_OF_MONTH));
			// resMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).add(preRresMonth).doubleValue();
			// return resMonth;
			// }


			//手机端缴费处理
			@@ -2140,29 +2006,27 @@
			}

			/**
			*
			* @param feeDto
			* @param cycle
			*/
			public void dealRentRateCycle(FeeDto feeDto,double cycle){
			public void dealRentRateCycle(FeeDto feeDto, double cycle) {

			if (!FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeDto.getComputingFormula())) {
			return;
			}

			Date endTime = feeDto.getEndTime();
			Date date = getTargetEndTime(cycle,endTime);
			Date date = getTargetEndTime(cycle, endTime);
			feeDto.setDeadlineTime(date);
			dealRentRate(feeDto);

			}

			/**
			*
			* @param feeDto
			* @param custEndTime
			*/
			public void dealRentRateCustEndTime(FeeDto feeDto,Date custEndTime){
			public void dealRentRateCustEndTime(FeeDto feeDto, Date custEndTime) {

			if (!FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeDto.getComputingFormula())) {
			return;
			@@ -2171,6 +2035,34 @@
			feeDto.setDeadlineTime(custEndTime);
			dealRentRate(feeDto);

			}

			@Override
			public long computeOneIntegralQuantity(IntegralRuleConfigDto integralRuleConfigDto, JSONObject reqJson) {
			String computingFormula = integralRuleConfigDto.getComputingFormula();
			BigDecimal amountDec = null;
			long amount = 0;
			if (IntegralRuleConfigDto.COMPUTING_FORMULA_AREA.equals(computingFormula)) { //面积乘以单价
			BigDecimal areaDec = new BigDecimal(Double.parseDouble(reqJson.getString("area")));
			BigDecimal squarePriceDec = new BigDecimal(Double.parseDouble(integralRuleConfigDto.getSquarePrice()));
			amountDec = areaDec.multiply(squarePriceDec).setScale(2, BigDecimal.ROUND_HALF_UP);
			} else if (IntegralRuleConfigDto.COMPUTING_FORMULA_MONEY.equals(computingFormula)) { // 金额乘以单价
			BigDecimal aDec = new BigDecimal(Double.parseDouble(reqJson.getString("amount")));
			BigDecimal squarePriceDec = new BigDecimal(Double.parseDouble(integralRuleConfigDto.getSquarePrice()));
			amountDec = aDec.multiply(squarePriceDec).setScale(2, BigDecimal.ROUND_HALF_UP);
			} else if (IntegralRuleConfigDto.COMPUTING_FORMULA_FIXED.equals(computingFormula)) { // 固定积分
			amountDec = new BigDecimal(Double.parseDouble(integralRuleConfigDto.getAdditionalAmount()));
			} else {
			amountDec = new BigDecimal(0);
			}

			if (IntegralRuleConfigDto.SCALE_UP.equals(integralRuleConfigDto.getScale())) {
			amount = new Double(Math.ceil(amountDec.doubleValue())).longValue();
			} else {
			amount = new Double(Math.floor(amountDec.doubleValue())).longValue();
			}
			integralRuleConfigDto.setQuantity(amount + "");
			return amount;
			}

			/**
			@@ -2227,21 +2119,176 @@
			return;
			}

			//todo 递增时间不是费用建账时间的倍数时，修正一下
			rateStartTime = correctByFeeStartTime(rateStartTime, feeDto.getStartTime());

			BigDecimal addTotalAmount = new BigDecimal("0");
			double curOweMonth = 0;
			BigDecimal curFeePrice = new BigDecimal(feeDto.getFeePrice());

			//todo 递增本轮欠费开始时间
			Date curOweStartTime = null;
			// todo 如果计费起始时间小于递增开始时间
			if (feeDto.getEndTime().getTime() < rateStartTime.getTime()) {
			//todo 递增前的欠费
			curOweMonth = DateUtil.dayCompare(feeDto.getEndTime(), rateStartTime);
			addTotalAmount = curFeePrice.multiply(new BigDecimal(curOweMonth)).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			// todo 递增
			curOweStartTime = rateStartTime;
			} else {
			// todo 递增
			curOweStartTime = feeDto.getEndTime();
			}
			double rateMonth = DateUtil.dayCompare(rateStartTime, feeDto.getDeadlineTime());

			// todo 最大周期递增轮数
			double maxCycle = Math.ceil(rateMonth / rateCycle);

			// todo 增长前的欠费
			BigDecimal rateDec = new BigDecimal(rate + "");
			BigDecimal oweAmountDec = null;
			//todo 递增轮数循环 curFeePrice 这个是原始租金
			for (int cycleIndex = 0; cycleIndex < maxCycle; cycleIndex++) {
			//todo 递增月单价
			curFeePrice = new BigDecimal("1").add(rateDec).multiply(curFeePrice).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			//todo 计算 curCycleRateEneTime 本轮递增结束时间
			Date curCycleRateEneTime = DateUtil.stepMonth(rateStartTime, (cycleIndex + 1) * rateCycle);

			//todo 说明这个已经缴费了
			if (curOweStartTime.getTime() > curCycleRateEneTime.getTime()) {
			continue;
			}
			//todo 本轮欠费开始时间大于 deadlineTime 跳过
			if (curOweStartTime.getTime() >= feeDto.getDeadlineTime().getTime()) {
			continue;
			}

			//todo 本轮递增时间未到费用deadlineTime
			if (curCycleRateEneTime.getTime() < feeDto.getDeadlineTime().getTime()) {
			curOweMonth = DateUtil.dayCompare(curOweStartTime, curCycleRateEneTime);
			curOweStartTime = curCycleRateEneTime;
			} else {
			curOweMonth = DateUtil.dayCompare(curOweStartTime, feeDto.getDeadlineTime());
			curOweStartTime = feeDto.getDeadlineTime();
			}

			oweAmountDec = curFeePrice.multiply(new BigDecimal(curOweMonth)).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);

			addTotalAmount = addTotalAmount.add(oweAmountDec);
			}

			Double amountOwed = MoneyUtil.computePriceScale(addTotalAmount.doubleValue(), feeDto.getScale(), Integer.parseInt(feeDto.getDecimalPlace()));
			feeDto.setAmountOwed(amountOwed + "");
			feeDto.setFeeTotalPrice(amountOwed);
			}

			/**
			* 修正递增开始时间
			* 如果设置的递增开始时间和建账时间不是同一天强制修正下
			*
			* @param rateStartTime
			* @param startTime
			* @return
			*/
			private Date correctByFeeStartTime(Date rateStartTime, Date startTime) {
			Calendar rateCalendar = Calendar.getInstance();
			rateCalendar.setTime(rateStartTime);
			int rateDay = rateCalendar.get(Calendar.DAY_OF_MONTH);
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(startTime);
			int day = calendar.get(Calendar.DAY_OF_MONTH);
			if (rateDay == day) {
			return rateStartTime;
			}

			rateCalendar = Calendar.getInstance();
			rateCalendar.setTime(rateStartTime);
			rateCalendar.add(Calendar.MONTH, 1);
			rateCalendar.set(Calendar.DAY_OF_MONTH, day);
			return rateCalendar.getTime();
			}


			/**
			* 租金处理
			*
			* @param feeDto
			*/
			public void dealRentRateOLd(FeeDto feeDto) {
			if (!FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeDto.getComputingFormula())) {
			return;
			}

			//查询递增信息
			FeeAttrDto feeAttrDto = new FeeAttrDto();
			feeAttrDto.setFeeId(feeDto.getFeeId());
			feeAttrDto.setCommunityId(feeDto.getCommunityId());
			List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);

			if (feeAttrDtos == null \|\| feeAttrDtos.size() < 1) {
			return;
			}
			int rateCycle = 0;
			double rate = 0.0;
			Date rateStartTime = null;
			try {
			for (FeeAttrDto tmpFeeAttrDto : feeAttrDtos) {
			if (FeeAttrDto.SPEC_CD_RATE.equals(tmpFeeAttrDto.getSpecCd())) {
			feeDto.setRate(tmpFeeAttrDto.getValue().trim());
			rate = Double.parseDouble(tmpFeeAttrDto.getValue().trim());
			}
			if (FeeAttrDto.SPEC_CD_RATE_CYCLE.equals(tmpFeeAttrDto.getSpecCd())) {
			feeDto.setRateCycle(tmpFeeAttrDto.getValue().trim());
			rateCycle = Integer.parseInt(tmpFeeAttrDto.getValue().trim());
			}
			if (FeeAttrDto.SPEC_CD_RATE_START_TIME.equals(tmpFeeAttrDto.getSpecCd())) {
			feeDto.setRateStartTime(tmpFeeAttrDto.getValue().trim());
			rateStartTime = DateUtil.getDateFromString(tmpFeeAttrDto.getValue().trim(), DateUtil.DATE_FORMATE_STRING_B);
			}
			}
			} catch (Exception e) {
			logger.error("租金递增异常", e);
			return;
			}

			if (!FeeDto.STATE_DOING.equals(feeDto.getState())) {
			return;
			}

			if (rateCycle == 0 \|\| rate == 0) {
			return;
			}

			if (feeDto.getDeadlineTime().getTime() <= rateStartTime.getTime()) {
			return;
			}

			BigDecimal oweAmountDec = new BigDecimal(0);
			//计算计费起始时间到 rateStartTime 时的费用
			double curOweMonth = 0;
			BigDecimal curFeePrice = new BigDecimal(feeDto.getFeePrice());

			// todo 如果计费起始时间小区递增开始时间
			if (feeDto.getEndTime().getTime() < rateStartTime.getTime()) {
			curOweMonth = dayCompare(feeDto.getEndTime(), rateStartTime);
			oweAmountDec = curFeePrice.multiply(new BigDecimal(curOweMonth)).setScale(2, BigDecimal.ROUND_HALF_UP);
			//todo 递增前的欠费
			curOweMonth = DateUtil.dayCompare(feeDto.getEndTime(), rateStartTime);
			oweAmountDec = curFeePrice.multiply(new BigDecimal(curOweMonth)).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			// todo 递增
			curOweMonth = DateUtil.dayCompare(rateStartTime, feeDto.getDeadlineTime());
			} else {
			// todo 递增
			curOweMonth = DateUtil.dayCompare(feeDto.getEndTime(), feeDto.getDeadlineTime());
			}
			double rateMonth = DateUtil.dayCompare(rateStartTime, feeDto.getDeadlineTime());

			curOweMonth = dayCompare(rateStartTime, feeDto.getDeadlineTime());
			// todo 最大周期递增轮数
			double maxCycle = Math.ceil(rateMonth / rateCycle);

			double maxCycle = Math.ceil(curOweMonth / rateCycle);

			// 增长前的欠费
			BigDecimal addTotalAmount = oweAmountDec ;
			// todo 增长前的欠费
			BigDecimal addTotalAmount = oweAmountDec;
			// todo 递增周期内的未递增费用
			BigDecimal preCycleAmount = curFeePrice.multiply(new BigDecimal(rateCycle));
			BigDecimal rateDec = null; //递增周期所收费用
			BigDecimal lastRateAmountDec = null;
			@@ -2250,32 +2297,34 @@
			Date curEndTime = null;
			for (int cycleIndex = 0; cycleIndex < maxCycle; cycleIndex++) {
			//当期增长部分
			rateDec = preCycleAmount.multiply(new BigDecimal(rate)).setScale(2, BigDecimal.ROUND_HALF_UP);
			rateDec = preCycleAmount.multiply(new BigDecimal(rate)).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			//增长周期的倍数
			curCycle = (cycleIndex + 1) * rateCycle;

			// 计算本轮的计费起始时间
			Calendar curEndTimeCalender = Calendar.getInstance();
			curEndTimeCalender.setTime(rateStartTime);
			curEndTimeCalender.add(Calendar.MONTH,new Double(curCycle).intValue());
			curEndTimeCalender.add(Calendar.MONTH, new Double(curCycle).intValue());
			curEndTime = curEndTimeCalender.getTime();
			if (curCycle > curOweMonth) {
			if (curCycle > rateMonth) {
			//不足增长周期增长率
			rateDec = new BigDecimal(curOweMonth / rateCycle - Math.floor(curOweMonth / rateCycle)).multiply(rateDec).setScale(2, BigDecimal.ROUND_HALF_UP);
			lastRateAmountDec = new BigDecimal(curOweMonth / rateCycle - Math.floor(curOweMonth / rateCycle)).multiply(preCycleAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
			rateDec = new BigDecimal(curOweMonth / rateCycle - Math.floor(curOweMonth / rateCycle)).multiply(rateDec).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			lastRateAmountDec = new BigDecimal(curOweMonth / rateCycle - Math.floor(curOweMonth / rateCycle)).multiply(preCycleAmount).setScale(FeeConfigConstant.FEE_SCALE, BigDecimal.ROUND_HALF_UP);
			addTotalAmount = addTotalAmount.add(rateDec).add(lastRateAmountDec);
			continue;
			}
			//本期金额
			curAmount = rateDec.add(preCycleAmount);// 增长部分 + 上本期费用
			//如果计费起始时间大于递增开始时间那么本轮不计入
			if(feeDto.getEndTime().getTime()< curEndTime.getTime()){
			if (feeDto.getEndTime().getTime() < curEndTime.getTime()) {
			addTotalAmount = addTotalAmount.add(curAmount); // 计入总的费用中
			}
			preCycleAmount = curAmount;
			}
			feeDto.setAmountOwed(addTotalAmount.doubleValue() + "");
			feeDto.setFeeTotalPrice(addTotalAmount.doubleValue());

			Double amountOwed = MoneyUtil.computePriceScale(addTotalAmount.doubleValue(), feeDto.getScale(), Integer.parseInt(feeDto.getDecimalPlace()));
			feeDto.setAmountOwed(amountOwed + "");
			feeDto.setFeeTotalPrice(amountOwed);
			}
			}