Lianxun_Java.git

			@@ -2198,16 +2198,16 @@
			try {
			for (FeeAttrDto tmpFeeAttrDto : feeAttrDtos) {
			if (FeeAttrDto.SPEC_CD_RATE.equals(tmpFeeAttrDto.getSpecCd())) {
			feeDto.setRate(tmpFeeAttrDto.getValue());
			rate = Double.parseDouble(tmpFeeAttrDto.getValue());
			feeDto.setRate(tmpFeeAttrDto.getValue().trim());
			rate = Double.parseDouble(tmpFeeAttrDto.getValue().trim());
			}
			if (FeeAttrDto.SPEC_CD_RATE_CYCLE.equals(tmpFeeAttrDto.getSpecCd())) {
			feeDto.setRateCycle(tmpFeeAttrDto.getValue());
			rateCycle = Integer.parseInt(tmpFeeAttrDto.getValue());
			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());
			rateStartTime = DateUtil.getDateFromString(tmpFeeAttrDto.getValue(), DateUtil.DATE_FORMATE_STRING_B);
			feeDto.setRateStartTime(tmpFeeAttrDto.getValue().trim());
			rateStartTime = DateUtil.getDateFromString(tmpFeeAttrDto.getValue().trim(), DateUtil.DATE_FORMATE_STRING_B);
			}
			}
			} catch (Exception e) {
			@@ -2269,7 +2269,7 @@
			//本期金额
			curAmount = rateDec.add(preCycleAmount);// 增长部分 + 上本期费用
			//如果计费起始时间大于递增开始时间那么本轮不计入
			if(feeDto.getEndTime().getTime()< curEndTime.getTime()){
			if(feeDto.getEndTime().getTime()<= curEndTime.getTime()){
			addTotalAmount = addTotalAmount.add(curAmount); // 计入总的费用中
			}
			preCycleAmount = curAmount;

			@@ -20,7 +20,6 @@
			import com.java110.intf.user.IOwnerInnerServiceSMO;
			import com.java110.utils.cache.MappingCache;
			import com.java110.utils.constant.ResponseConstant;
			import com.java110.utils.exception.CmdException;
			import com.java110.utils.exception.ListenerExecuteException;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.DateUtil;
			@@ -34,9 +33,6 @@

			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.text.ParseException;
			import java.time.LocalDate;
			import java.time.format.DateTimeFormatter;
			import java.util.*;

			@Service
			@@ -184,13 +180,10 @@
			feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
			feeDto.setFeeTotalPrice(Double.parseDouble(feePriceAll.get("feeTotalPrice").toString()));

			if(!StringUtil.isEmpty(custEndTime)){
			try {
			computeFeeSMOImpl.dealRentRateCustEndTime(feeDto, DateUtil.getDateFromString(custEndTime,DateUtil.DATE_FORMATE_STRING_B));
			} catch (Exception e) {
			throw new CmdException("计算费用失败"+e);
			}
			}else {
			if (!StringUtil.isEmpty(custEndTime)) {
			Date date = DateUtil.getDateFromStringB(custEndTime);
			computeFeeSMOImpl.dealRentRateCustEndTime(feeDto, date);
			} else {
			computeFeeSMOImpl.dealRentRateCycle(feeDto, NumberUtil.getDouble(feeDto.getCycle()));
			}

			@@ -463,7 +456,7 @@
			feePrice = 0.0;
			} else if ("1101".equals(computingFormula)) { // 租金
			feePrice = 0.0;
			}else if ("1102".equals(computingFormula)) { // 租金
			} else if ("1102".equals(computingFormula)) { // 租金
			feePrice = 0.0;
			} else if ("4004".equals(computingFormula)) {
			feePrice = Double.parseDouble(feeDto.getAmount());
			@@ -587,7 +580,7 @@
			} 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)) {
			} else if ("4004".equals(computingFormula)) {
			feePrice = Double.parseDouble(feeDto.getAmount());
			} else if ("5005".equals(computingFormula)) {

	java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史