From e99623e2173143c6ae508f11046a581f7bd225dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 22 九月 2020 11:09:52 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 384 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 377 insertions(+), 7 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 2951db4..f48ac32 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
@@ -1,33 +1,47 @@
package com.java110.fee.bmo.impl;
+import com.alibaba.fastjson.JSONArray;
import com.java110.dto.RoomDto;
import com.java110.dto.fee.BillDto;
import com.java110.dto.fee.BillOweFeeDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.fee.bmo.IQueryOweFee;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.utils.util.DateUtil;
+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;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
+import java.math.RoundingMode;
+import java.text.ParseException;
+import java.util.*;
@Service
public class QueryOweFeeImpl implements IQueryOweFee {
+ private final static Logger logger = LoggerFactory.getLogger(QueryOweFeeImpl.class);
+
+
@Autowired
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@@ -71,12 +85,63 @@
@Override
public ResponseEntity<String> queryAllOwneFee(FeeDto feeDto) {
ResponseEntity<String> responseEntity = null;
+
+ if (!freshFeeDtoParam(feeDto)) {
+ return ResultVo.createResponseEntity(1, 0, new JSONArray());
+ }
+
if (FeeConfigDto.BILL_TYPE_EVERY.equals(feeDto.getBillType())) {
responseEntity = computeEveryOweFee(feeDto);
} else {
responseEntity = computeBillOweFee(feeDto);
}
return responseEntity;
+ }
+
+ private boolean freshFeeDtoParam(FeeDto feeDto) {
+
+ if (StringUtil.isEmpty(feeDto.getPayerObjId())) {
+ return true;
+ }
+
+ if (!feeDto.getPayerObjId().contains("-")) {
+ return false;
+ }
+ if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) {
+ String[] nums = feeDto.getPayerObjId().split("-");
+ if (nums.length != 3) {
+ return false;
+ }
+ RoomDto roomDto = new RoomDto();
+ roomDto.setFloorNum(nums[0]);
+ roomDto.setUnitNum(nums[1]);
+ roomDto.setRoomNum(nums[2]);
+ roomDto.setCommunityId(feeDto.getCommunityId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+ if (roomDtos == null || roomDtos.size() < 1) {
+ return false;
+ }
+ feeDto.setPayerObjId(roomDtos.get(0).getRoomId());
+
+ } else {
+ String[] nums = feeDto.getPayerObjId().split("-");
+ if (nums.length != 2) {
+ return false;
+ }
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setAreaNum(nums[0]);
+ parkingSpaceDto.setNum(nums[1]);
+ parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+
+ if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) {
+ return false;
+ }
+ feeDto.setPayerObjId(parkingSpaceDtos.get(0).getPsId());
+ }
+
+ return true;
}
/**
@@ -124,6 +189,7 @@
List<String> psIds = new ArrayList<>();
for (FeeDto fee : feeDtos) {
+ // 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
if ("3333".equals(fee.getPayerObjType())) { //鎴垮眿鐩稿叧
roomFees.add(fee);
roomIds.add(fee.getPayerObjId());
@@ -137,7 +203,7 @@
computeRoomFee(roomFees, roomIds);
}
- if (roomFees.size() > 0) {
+ if (psFees.size() > 0) {
computePsFee(psFees, psIds);
}
}
@@ -148,6 +214,83 @@
* @param psFees
*/
private void computePsFee(List<FeeDto> psFees, List<String> psIds) {
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setCommunityId(psFees.get(0).getCommunityId());
+ parkingSpaceDto.setPsIds(psIds.toArray(new String[psIds.size()]));
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+
+ if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
+ return;
+ }
+ for (ParkingSpaceDto tmpParkingSpaceDto : parkingSpaceDtos) {
+ for (FeeDto feeDto : psFees) {
+ dealFeePs(tmpParkingSpaceDto, feeDto);
+ }
+ }
+
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setOwnerIds(psIds.toArray(new String[psIds.size()]));
+ ownerDto.setCommunityId(psFees.get(0).getCommunityId());
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByParkingSpace(ownerDto);
+
+ for (OwnerDto tmpOwnerDto : ownerDtos) {
+ for (FeeDto feeDto : psFees) {
+ dealFeeOwner(tmpOwnerDto, feeDto);
+ }
+ }
+ }
+
+ private void dealFeePs(ParkingSpaceDto tmpParkingSpaceDto, FeeDto feeDto) {
+ // 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
+ Map<String, Object> targetEndDateAndOweMonth = getTargetEndDateAndOweMonth(feeDto);
+ Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
+ double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
+ if (!tmpParkingSpaceDto.getPsId().equals(feeDto.getPayerObjId())) {
+ return;
+ }
+ feeDto.setRoomName(tmpParkingSpaceDto.getAreaNum() + "鍋滆溅鍦�" + tmpParkingSpaceDto.getNum() + "杞︿綅");
+
+ String computingFormula = feeDto.getComputingFormula();
+ double feePrice = 0.00;
+ if ("1001".equals(computingFormula)) { //闈㈢Н*鍗曚环+闄勫姞璐�
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
+ BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(tmpParkingSpaceDto.getArea()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ } else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
+
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ } else if ("4004".equals(computingFormula)) {
+ feePrice = Double.parseDouble(feeDto.getAmount());
+ } else if ("5005".equals(computingFormula)) {
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ feePrice = -1.00;
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
+ } else {
+ feePrice = 0.00;
+ }
+
+ feeDto.setFeePrice(feePrice);
+ // double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
+ BigDecimal price = new BigDecimal(feeDto.getFeePrice());
+ price = price.multiply(new BigDecimal(oweMonth));
+ feeDto.setAmountOwed(price.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + "");
+ feeDto.setDeadlineTime(targetEndDate);
+ //鍔ㄦ�佽垂鐢�
+ if ("4004".equals(computingFormula)) {
+ feeDto.setAmountOwed(feeDto.getFeePrice() + "");
+ feeDto.setDeadlineTime(DateUtil.getCurrentDate());
+ }
}
/**
@@ -165,17 +308,40 @@
return;
}
+
for (RoomDto tmpRoomDto : roomDtos) {
for (FeeDto feeDto : roomFees) {
dealFeeRoom(tmpRoomDto, feeDto);
}
}
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ ownerDto.setCommunityId(roomFees.get(0).getCommunityId());
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+
+ for (OwnerDto tmpOwnerDto : ownerDtos) {
+ for (FeeDto feeDto : roomFees) {
+ dealFeeOwner(tmpOwnerDto, feeDto);
+ }
+ }
}
- private void dealFeeRoom(RoomDto tmpRoomDto, FeeDto feeDto) {
+ private void dealFeeOwner(OwnerDto tmpOwnerDto, FeeDto feeDto) {
+ if (!tmpOwnerDto.getRoomId().equals(feeDto.getPayerObjId())) {
+ return;
+ }
+
+ feeDto.setOwnerName(tmpOwnerDto.getName());
+ feeDto.setOwnerTel(tmpOwnerDto.getLink());
+ }
+
+ private void dealFeeRoom(RoomDto tmpRoomDto, FeeDto feeDto) {
+ Map<String, Object> targetEndDateAndOweMonth = getTargetEndDateAndOweMonth(feeDto);
+ Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
+ double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
if (!tmpRoomDto.getRoomId().equals(feeDto.getPayerObjId())) {
return;
}
@@ -193,10 +359,36 @@
feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
} else if ("4004".equals(computingFormula)) {
feePrice = Double.parseDouble(feeDto.getAmount());
+ } else if ("5005".equals(computingFormula)) {
+
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ feePrice = -1.00;
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
} else {
feePrice = 0.00;
}
feeDto.setFeePrice(feePrice);
+
+ //double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
+ BigDecimal price = new BigDecimal(feeDto.getFeePrice());
+ price = price.multiply(new BigDecimal(oweMonth));
+ feeDto.setAmountOwed(price.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + "");
+ feeDto.setDeadlineTime(targetEndDate);
+
+ //鍔ㄦ�佽垂鐢�
+ if ("4004".equals(computingFormula)) {
+ feeDto.setAmountOwed(feeDto.getFeePrice() + "");
+ feeDto.setDeadlineTime(DateUtil.getCurrentDate());
+ }
}
@@ -231,6 +423,11 @@
tmpFeeDto.setFeePrice(0.00);
return;
}
+ try {
+ tmpFeeDto.setDeadlineTime(DateUtil.getDateFromString(billOweFeeDtos.get(0).getDeadlineTime(), DateUtil.DATE_FORMATE_STRING_A));
+ } catch (ParseException e) {
+ logger.error("鑾峰彇缁撴潫鏃堕棿澶辫触", e);
+ }
tmpFeeDto.setFeePrice(Double.parseDouble(billOweFeeDtos.get(0).getAmountOwed()));
}
@@ -245,7 +442,9 @@
}
private void computeFeePriceByParkingSpace(FeeDto feeDto) {
-
+ Map<String, Object> targetEndDateAndOweMonth = getTargetEndDateAndOweMonth(feeDto);
+ Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
+ double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
parkingSpaceDto.setPsId(feeDto.getPayerObjId());
@@ -268,12 +467,34 @@
feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
} else if ("4004".equals(computingFormula)) {
feePrice = Double.parseDouble(feeDto.getAmount());
+ } else if ("5005".equals(computingFormula)) {
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ feePrice = -1.00;
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
} else {
feePrice = 0.00;
}
-
feeDto.setFeePrice(feePrice);
+ 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_EVEN).doubleValue());
+ feeDto.setDeadlineTime(targetEndDate);
+ //鍔ㄦ�佽垂鐢�
+ if ("4004".equals(computingFormula)) {
+ feeDto.setAmountOwed(feeDto.getFeePrice() + "");
+ feeDto.setDeadlineTime(DateUtil.getCurrentDate());
+ }
}
@@ -283,6 +504,9 @@
* @param feeDto
*/
private void computeFeePriceByRoom(FeeDto feeDto) {
+ Map<String, Object> targetEndDateAndOweMonth = getTargetEndDateAndOweMonth(feeDto);
+ Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
+ double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
RoomDto roomDto = new RoomDto();
roomDto.setCommunityId(feeDto.getCommunityId());
roomDto.setRoomId(feeDto.getPayerObjId());
@@ -304,12 +528,158 @@
feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
} else if ("4004".equals(computingFormula)) {
feePrice = Double.parseDouble(feeDto.getAmount());
+ } else if ("5005".equals(computingFormula)) {
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ feePrice = -1.00;
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
} else {
feePrice = 0.00;
}
-
feeDto.setFeePrice(feePrice);
+ //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_EVEN).doubleValue());
+ feeDto.setDeadlineTime(targetEndDate);
+
+ //鍔ㄦ�佽垂鐢�
+ if ("4004".equals(computingFormula)) {
+ feeDto.setAmountOwed(feeDto.getFeePrice() + "");
+ feeDto.setDeadlineTime(DateUtil.getCurrentDate());
+ }
+ }
+
+
+ /**
+ * 璁＄畻2涓棩鏈熶箣闂寸浉宸殑 浠ュ勾銆佹湀銆佹棩涓哄崟浣嶏紝鍚勮嚜璁＄畻缁撴灉鏄灏�
+ * 姣斿锛�2011-02-02 鍒� 2017-03-02
+ * 浠ュ勾涓哄崟浣嶇浉宸负锛�6骞�
+ * 浠ユ湀涓哄崟浣嶇浉宸负锛�73涓湀
+ * 浠ユ棩涓哄崟浣嶇浉宸负锛�2220澶�
+ *
+ * @param fromDate
+ * @param toDate
+ * @return
+ */
+ public static double dayCompare(Date fromDate, Date toDate) {
+ Calendar from = Calendar.getInstance();
+ from.setTime(fromDate);
+ Calendar to = Calendar.getInstance();
+ to.setTime(toDate);
+
+ long t1 = from.getTimeInMillis();
+ long t2 = to.getTimeInMillis();
+ long days = (t2 - t1) / (24 * 60 * 60 * 1000);
+
+ BigDecimal tmpDays = new BigDecimal(days);
+ BigDecimal monthDay = new BigDecimal(30);
+
+ return tmpDays.divide(monthDay, 2, RoundingMode.HALF_UP).doubleValue();
+ }
+
+ private Map getTargetEndDateAndOweMonth(FeeDto feeDto) {
+ Date targetEndDate = null;
+ double oweMonth = 0.0;
+
+ Map<String, Object> targetEndDateAndOweMonth = new HashMap<>();
+
+ if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
+ targetEndDate = feeDto.getEndTime();
+ targetEndDateAndOweMonth.put("oweMonth", oweMonth);
+ targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
+ return targetEndDateAndOweMonth;
+ }
+ if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
+ if (!StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ targetEndDate = feeDto.getCurReadingTime();
+ } else if (feeDto.getImportFeeEndTime() == null) {
+ targetEndDate = feeDto.getConfigEndTime();
+ } else {
+ targetEndDate = feeDto.getImportFeeEndTime();
+ }
+ //鍒ゆ柇褰撳墠璐圭敤鏄笉鏄鍏ヨ垂鐢�
+ oweMonth = 1.0;
+
+ } else {
+ //褰撳墠鏃堕棿
+ Date billEndTime = DateUtil.getCurrentDate();
+ //寮�濮嬫椂闂�
+ Date startDate = feeDto.getStartTime();
+ //鍒版湡鏃堕棿
+ Date endDate = feeDto.getEndTime();
+ 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);
+
+ if (ownerCarDtos == null || ownerCarDtos.size() != 1) {
+ targetEndDateAndOweMonth.put("oweMonth", 0);
+ targetEndDateAndOweMonth.put("targetEndDate", "");
+ return targetEndDateAndOweMonth;
+ }
+
+ targetEndDate = ownerCarDtos.get(0).getEndTime();
+ //璇存槑娌℃湁娆犺垂
+ if (endDate.getTime() >= targetEndDate.getTime()) {
+ // 鐩爣鍒版湡鏃堕棿 - 鍒版湡鏃堕棿 = 娆犺垂鏈堜唤
+ oweMonth = 0;
+ targetEndDateAndOweMonth.put("oweMonth", oweMonth);
+ targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
+ return targetEndDateAndOweMonth;
+ }
+ }
+
+ //缂磋垂鍛ㄦ湡
+ long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
+ // 褰撳墠鏃堕棿 - 寮�濮嬫椂闂� = 鏈堜唤
+ double mulMonth = 0.0;
+ mulMonth = dayCompare(startDate, billEndTime);
+
+ // 鏈堜唤/ 鍛ㄦ湡 = 杞暟锛堝悜涓婂彇鏁达級
+ double round = 0.0;
+ if ("1200".equals(feeDto.getPaymentCd())) { // 棰勪粯璐�
+ round = Math.floor(mulMonth / paymentCycle) + 1;
+ } else { //鍚庝粯璐�
+ round = Math.floor(mulMonth / paymentCycle);
+ }
+ // 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
+ targetEndDate = getTargetEndTime(round * paymentCycle, startDate);
+ //璐圭敤 蹇粨鏉熶簡
+ if (feeDto.getConfigEndTime().getTime() < targetEndDate.getTime()) {
+ targetEndDate = feeDto.getConfigEndTime();
+ }
+ //璇存槑娌℃湁娆犺垂
+ if (endDate.getTime() < targetEndDate.getTime()) {
+ // 鐩爣鍒版湡鏃堕棿 - 鍒版湡鏃堕棿 = 娆犺垂鏈堜唤
+ oweMonth = dayCompare(endDate, targetEndDate);
+ }
+
+ if (feeDto.getEndTime().getTime() > targetEndDate.getTime()) {
+ targetEndDate = feeDto.getEndTime();
+ }
+ }
+
+ targetEndDateAndOweMonth.put("oweMonth", oweMonth);
+ targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
+ return targetEndDateAndOweMonth;
+ }
+
+ private Date getTargetEndTime(double v, Date startDate) {
+ Calendar endDate = Calendar.getInstance();
+ endDate.setTime(startDate);
+ endDate.add(Calendar.MONTH, (int) v);
+ return endDate.getTime();
}
}
--
Gitblit v1.8.0