From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 1100 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 993 insertions(+), 107 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
old mode 100644
new mode 100755
index 48d6cdc..f331270
--- a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -1,13 +1,16 @@
package com.java110.core.smo.impl;
+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.community.CommunityDto;
-import com.java110.dto.fee.BillDto;
-import com.java110.dto.fee.BillOweFeeDto;
-import com.java110.dto.fee.FeeAttrDto;
-import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.FeeDto;
+import com.java110.dto.contract.ContractDto;
+import com.java110.dto.contractRoom.ContractRoomDto;
+import com.java110.dto.fee.*;
+import com.java110.dto.machine.CarInoutDetailDto;
+import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.parking.ParkingSpaceDto;
@@ -17,7 +20,12 @@
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.ITempCarFeeConfigAttrInnerServiceSMO;
+import com.java110.intf.fee.ITempCarFeeConfigInnerServiceSMO;
+import com.java110.intf.store.IContractInnerServiceSMO;
+import com.java110.intf.store.IContractRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
@@ -28,20 +36,19 @@
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import java.math.BigDecimal;
+import java.text.DateFormat;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
/**
* 璐圭敤璁＄畻 鏈嶅姟绫�
@@ -60,6 +67,9 @@
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
@Autowired(required = false)
+ private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+
+ @Autowired(required = false)
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@Autowired(required = false)
@@ -73,6 +83,21 @@
@Autowired(required = false)
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+ @Autowired(required = false)
+ private IContractRoomInnerServiceSMO contractRoomInnerServiceSMOImpl;
+
+ @Autowired(required = false)
+ private IContractInnerServiceSMO contractInnerServiceSMOImpl;
+
+ @Autowired(required = false)
+ private ITempCarFeeConfigInnerServiceSMO tempCarFeeConfigInnerServiceSMOImpl;
+
+ @Autowired(required = false)
+ private ITempCarFeeConfigAttrInnerServiceSMO tempCarFeeConfigAttrInnerServiceSMOImpl;
+
+ @Autowired
+ private Java110Properties java110Properties;
@Override
public Date getFeeEndTime() {
@@ -92,6 +117,7 @@
public void computeEveryOweFee(FeeDto tmpFeeDto, RoomDto roomDto) {
computeFeePrice(tmpFeeDto, roomDto);
}
+
/**
* 璁＄畻娆犺垂閲戦
@@ -138,6 +164,8 @@
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);
}
}
@@ -155,16 +183,18 @@
}
String computingFormula = feeDto.getComputingFormula();
- double feePrice = getFeePrice(feeDto);
+ Map feePriceAll = getFeePrice(feeDto);
- feeDto.setFeePrice(feePrice);
+ 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_EVEN).doubleValue());
+ feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
feeDto.setDeadlineTime(targetEndDate);
//鍔ㄦ�佽垂鐢�
- if ("4004".equals(computingFormula) && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
+ 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()); 娆犺垂鏃ユ湡涓嶅鍏堟敞閲�
}
@@ -182,16 +212,46 @@
double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
String computingFormula = feeDto.getComputingFormula();
- double feePrice = getFeePrice(feeDto, roomDto);
- feeDto.setFeePrice(feePrice);
+ 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_EVEN).doubleValue());
+ feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
feeDto.setDeadlineTime(targetEndDate);
//鍔ㄦ�佽垂鐢�
- if ("4004".equals(computingFormula) && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
+ 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 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()); 娆犺垂鏃ユ湡涓嶅鍏堟敞閲�
}
@@ -221,13 +281,22 @@
} else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
feeReceiptDetailPo.setArea("");
feeReceiptDetailPo.setSquarePrice(feeDto.getAdditionalAmount());
+ } else if ("3003".equals(computingFormula)) { // 鍥哄畾璐圭敤
+ feeReceiptDetailPo.setArea(roomDtos.get(0).getRoomArea());
+ feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+ } else if ("1101".equals(computingFormula)) { // 绉熼噾
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice(roomDto.getRoomRent());
+ } else if ("1102".equals(computingFormula)) { // 绉熼噾
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice(roomDto.getRoomRent());
} else if ("4004".equals(computingFormula)) {
} else if ("5005".equals(computingFormula)) {
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
} else {
BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
- BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_UP);
feeReceiptDetailPo.setArea(sub.doubleValue() + "");
feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
}
@@ -244,7 +313,22 @@
} else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
feeReceiptDetailPo.setArea(roomDtos.get(0).getBuiltUpArea());
feeReceiptDetailPo.setSquarePrice(feeDto.getComputingFormulaText());
- } else {
+ } else if ("9009".equals(computingFormula)) {
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_UP);
+ feeReceiptDetailPo.setArea(sub.doubleValue() + "");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getMwPrice() + "/" + feeDto.getAdditionalAmount());
+ }
+ } else if ("1101".equals(computingFormula)) { //绉熼噾
+ feeReceiptDetailPo.setArea(roomDtos.get(0).getBuiltUpArea());
+ feeReceiptDetailPo.setSquarePrice(roomDtos.get(0).getRoomRent());
+ } else if ("1102".equals(computingFormula)) { //绉熼噾
+ feeReceiptDetailPo.setArea(roomDtos.get(0).getBuiltUpArea());
+ feeReceiptDetailPo.setSquarePrice(roomDtos.get(0).getRoomRent());
+ }else {
}
} else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
String computingFormula = feeDto.getComputingFormula();
@@ -266,13 +350,22 @@
} else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
feeReceiptDetailPo.setArea("");
feeReceiptDetailPo.setSquarePrice(feeDto.getAdditionalAmount());
+ } else if ("3003".equals(computingFormula)) { // 鍥哄畾璐圭敤
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice("0");
+ } else if ("1101".equals(computingFormula)) { // 绉熼噾
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice("0");
+ } else if ("1102".equals(computingFormula)) { // 绉熼噾锛堥�掑锛�
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice("0");
} else if ("4004".equals(computingFormula)) {
} else if ("5005".equals(computingFormula)) {
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
} else {
BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
- BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_UP);
feeReceiptDetailPo.setArea(sub.doubleValue() + "");
feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
}
@@ -296,6 +389,96 @@
}
feeReceiptDetailPo.setArea(parkingSpaceDtos.get(0).getArea());
feeReceiptDetailPo.setSquarePrice(feeDto.getComputingFormulaText());
+ } else if ("9009".equals(computingFormula)) {
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_UP);
+ feeReceiptDetailPo.setArea(sub.doubleValue() + "");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getMwPrice() + "/" + feeDto.getAdditionalAmount());
+ }
+ } else {
+
+ }
+ } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
+ String computingFormula = feeDto.getComputingFormula();
+ ContractRoomDto contractRoomDto = new ContractRoomDto();
+ contractRoomDto.setContractId(feeDto.getPayerObjId());
+ contractRoomDto.setCommunityId(feeDto.getCommunityId());
+ List<ContractRoomDto> contractRoomDtos = contractRoomInnerServiceSMOImpl.queryContractRooms(contractRoomDto);
+ if (contractRoomDtos == null || contractRoomDtos.size() == 0) {
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+ return;
+ }
+ if ("1001".equals(computingFormula)) { //闈㈢Н*鍗曚环+闄勫姞璐�
+ BigDecimal builtUpArea = new BigDecimal(0);
+ for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
+ builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getBuiltUpArea())));
+ }
+ feeReceiptDetailPo.setArea(builtUpArea.doubleValue() + "");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+ } else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getAdditionalAmount());
+ } else if ("3003".equals(computingFormula)) { // 鍥哄畾璐圭敤
+ BigDecimal builtUpArea = new BigDecimal(0);
+ for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
+ builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getRoomArea())));
+ }
+ feeReceiptDetailPo.setArea(builtUpArea.doubleValue() + "");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+ } else if ("1101".equals(computingFormula)) { // 绉熼噾
+ BigDecimal builtUpArea = new BigDecimal(0);
+ for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
+ builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getRoomRent())));
+ }
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice(builtUpArea.doubleValue() + "");
+ } else if ("1102".equals(computingFormula)) { // 绉熼噾
+ BigDecimal builtUpArea = new BigDecimal(0);
+ for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
+ builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getRoomRent())));
+ }
+ feeReceiptDetailPo.setArea("");
+ feeReceiptDetailPo.setSquarePrice(builtUpArea.doubleValue() + "");
+ }else if ("4004".equals(computingFormula)) {
+ } else if ("5005".equals(computingFormula)) {
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_UP);
+ feeReceiptDetailPo.setArea(sub.doubleValue() + "");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+ }
+ } else if ("6006".equals(computingFormula)) {
+ String value = "";
+ List<FeeAttrDto> feeAttrDtos = feeDto.getFeeAttrDtos();
+ for (FeeAttrDto feeAttrDto : feeAttrDtos) {
+ if (feeAttrDto.getSpecCd().equals(FeeAttrDto.SPEC_CD_PROXY_CONSUMPTION)) {
+ value = feeAttrDto.getValue();
+ }
+ }
+ feeReceiptDetailPo.setArea(value);
+ feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+ } else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
+ BigDecimal builtUpArea = new BigDecimal(0);
+ for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
+ builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getBuiltUpArea())));
+ }
+ feeReceiptDetailPo.setArea(builtUpArea.doubleValue() + "");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getComputingFormulaText());
+ } else if ("9009".equals(computingFormula)) {
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_UP);
+ feeReceiptDetailPo.setArea(sub.doubleValue() + "");
+ feeReceiptDetailPo.setSquarePrice(feeDto.getMwPrice() + "/" + feeDto.getAdditionalAmount());
+ }
} else {
}
}
@@ -320,9 +503,9 @@
}
roomDto = roomDtos.get(0);
if (RoomDto.ROOM_TYPE_ROOM.equals(roomDto.getRoomType())) {
- objName = roomDto.getFloorNum() + "鏍�" + roomDto.getUnitNum() + "鍗曞厓" + roomDto.getRoomNum() + "瀹�";
+ objName = roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + roomDto.getRoomNum();
} else {
- objName = roomDto.getFloorNum() + "鏍�" + roomDto.getRoomNum() + "瀹�";
+ objName = roomDto.getFloorNum() + "-" + roomDto.getRoomNum();
}
} else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
@@ -342,7 +525,17 @@
if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
return objName;
}
- objName = objName + "(" + parkingSpaceDtos.get(0).getAreaNum() + "鍋滆溅鍦�" + parkingSpaceDtos.get(0).getNum() + "杞︿綅)";
+ objName = objName + "-" + parkingSpaceDtos.get(0).getAreaNum() + "鍋滆溅鍦�" + "-" + parkingSpaceDtos.get(0).getNum() + "杞︿綅";
+ } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeDto.getPayerObjType())) {
+ ContractDto contractDto = new ContractDto();
+ contractDto.setContractId(feeDto.getPayerObjId());
+ contractDto.setCommunityId(feeDto.getCommunityId());
+ List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
+ if (contractDtos == null || contractDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
+ return objName;
+ }
+ objName = contractDtos.get(0).getContractCode();
+
}
return objName;
}
@@ -363,15 +556,30 @@
return ownerDtos.get(0);
}
- if(FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())){
+ if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCarId(feeDto.getPayerObjId());
ownerCarDto.setCommunityId(feeDto.getCommunityId());
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- Assert.listOnlyOne(ownerCarDtos,"杞﹁締涓嶅瓨鍦�");
+ Assert.listOnlyOne(ownerCarDtos, "杞﹁締涓嶅瓨鍦�");
ownerDto = new OwnerDto();
ownerDto.setOwnerId(ownerCarDtos.get(0).getOwnerId());
+ ownerDto.setCommunityId(feeDto.getCommunityId());
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+ Assert.listOnlyOne(ownerDtos, "涓氫富涓嶅瓨鍦�");
+ return ownerDtos.get(0);
+ }
+
+ if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeDto.getPayerObjType())) {
+ ContractDto contractDto = new ContractDto();
+ contractDto.setContractId(feeDto.getPayerObjId());
+ contractDto.setCommunityId(feeDto.getCommunityId());
+ List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
+
+ Assert.listOnlyOne(contractDtos, "鍚堝悓涓嶅瓨鍦�");
+ ownerDto = new OwnerDto();
+ ownerDto.setOwnerId(contractDtos.get(0).getObjId());
ownerDto.setCommunityId(feeDto.getCommunityId());
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
Assert.listOnlyOne(ownerDtos, "涓氫富涓嶅瓨鍦�");
@@ -527,7 +735,7 @@
continue;
}
if (tmpRoomDto.getRoomId().equals(feeDto.getPayerObjId())) {
- objName = tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getUnitNum() + "鍗曞厓" + tmpRoomDto.getRoomNum() + "瀹�";
+ objName = tmpRoomDto.getFloorNum() + "-" + tmpRoomDto.getUnitNum() + "-" + tmpRoomDto.getRoomNum();
feeDto.setPayerObjName(objName);
}
}
@@ -555,6 +763,10 @@
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())){
+ if ((endCalender.getTime()).after(feeDto.getDeadlineTime())) {
+ return FeeDto.STATE_FINISH;
+ }
} else {
if ((endCalender.getTime()).after(feeDto.getConfigEndTime())) {
return FeeDto.STATE_FINISH;
@@ -586,6 +798,10 @@
} else {
endCalender.setTime(feeDto.getImportFeeEndTime());
}
+ } else if(FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())){
+ if ((endCalender.getTime()).after(feeDto.getDeadlineTime())) {
+ endCalender.setTime(feeDto.getDeadlineTime());
+ }
} else {
if ((endCalender.getTime()).after(feeDto.getConfigEndTime())) {
endCalender.setTime(feeDto.getConfigEndTime());
@@ -612,11 +828,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_EVEN);
+ feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, 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_EVEN);
+ feePrice = additionalAmount.setScale(2, 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);
+ } 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)) { // 绉熼噾
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getRoomRent()));
+ feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
} else if ("4004".equals(computingFormula)) {
feePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAmount()));
} else if ("5005".equals(computingFormula)) {
@@ -630,12 +857,25 @@
BigDecimal sub = curDegree.subtract(preDegree);
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
- .setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
}
} else if ("6006".equals(computingFormula)) {
feePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAmount()));
} else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
feePrice = computeRoomCustomizeFormula(BeanConvertUtil.covertBean(tmpReportFeeDto, FeeDto.class), BeanConvertUtil.covertBean(reportRoomDto, RoomDto.class));
+ } else if ("9009".equals(computingFormula)) {
+ if (StringUtil.isEmpty(tmpReportFeeDto.getCurDegrees())) {
+ //throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getMwPrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
+ }
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
}
@@ -646,12 +886,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_EVEN);
+ feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, 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_EVEN);
- } else if ("4004".equals(computingFormula)) {
+ feePrice = additionalAmount.setScale(2, 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)) { // 绉熼噾
+ feePrice = new BigDecimal(0);
+ }else if ("4004".equals(computingFormula)) {
feePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAmount()));
} else if ("5005".equals(computingFormula)) {
if (StringUtil.isEmpty(tmpReportFeeDto.getCurDegrees())) {
@@ -664,27 +911,45 @@
BigDecimal sub = curDegree.subtract(preDegree);
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
- .setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
}
} else if ("6006".equals(computingFormula)) {
feePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAmount()));
} else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
feePrice = computeCarCustomizeFormula(BeanConvertUtil.covertBean(tmpReportFeeDto, FeeDto.class), BeanConvertUtil.covertBean(reportCarDto, OwnerCarDto.class));
+ } else if ("9009".equals(computingFormula)) {
+ if (StringUtil.isEmpty(tmpReportFeeDto.getCurDegrees())) {
+ throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getMwPrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
+ }
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
}
}
- return feePrice.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ return feePrice.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
}
@Override
- public double getFeePrice(FeeDto feeDto) {
+ public Map getFeePrice(FeeDto feeDto) {
return getFeePrice(feeDto, null);
}
@Override
- public double getFeePrice(FeeDto feeDto, RoomDto roomDto) {
- BigDecimal feePrice = new BigDecimal(0.0);
+ public Map getFeePrice(FeeDto feeDto, RoomDto roomDto) {
+ BigDecimal feePrice = new BigDecimal("0.0");
+ BigDecimal feeTotalPrice = new BigDecimal(0.0);
+ Map<String, Object> feeAmount = new HashMap<>();
+ if (Environment.isOwnerPhone(java110Properties)) {
+ return getOwnerPhoneFee(feeAmount);
+ }
if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
String computingFormula = feeDto.getComputingFormula();
if (roomDto == null) {
@@ -693,7 +958,7 @@
roomDto.setCommunityId(feeDto.getCommunityId());
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
if (roomDtos == null || roomDtos.size() != 1) {
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒版埧灞嬩俊鎭紝鏌ヨ澶氭潯鏁版嵁");
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒版埧灞嬩俊鎭紝鏌ヨ澶氭潯鏁版嵁 roomId=" + feeDto.getPayerObjId());
}
roomDto = roomDtos.get(0);
}
@@ -702,13 +967,89 @@
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_EVEN);
+ feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle()) && !"0".equals(feeDto.getCycle())) {
+ BigDecimal cycle = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ if (!StringUtil.isEmpty(feeDto.getCycle()) && "0".equals(feeDto.getCycle()) && !StringUtil.isEmpty(feeDto.getCustEndTime())) {
+ //璁＄畻鍛ㄦ湡
+ 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);
+ }
+
+ }
} 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_EVEN);
+ feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ }else if ("1102".equals(computingFormula)) { // 绉熼噾
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
+ feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
} else if ("4004".equals(computingFormula)) { //鍔ㄦ�佽垂鐢�
feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ BigDecimal amount = new BigDecimal(feeDto.getAmount());
+ feeTotalPrice = amount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
} else if ("5005".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍗曚环+闄勫姞璐�
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
//throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
@@ -720,14 +1061,50 @@
BigDecimal sub = curDegree.subtract(preDegree);
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
- .setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
+
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
}
} else if ("6006".equals(computingFormula)) {
feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ BigDecimal amount = new BigDecimal(feeDto.getAmount());
+ feeTotalPrice = amount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
} else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
feePrice = computeRoomCustomizeFormula(feeDto, roomDto);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = feePrice.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
} else if ("8008".equals(computingFormula)) { //鎵嬪姩鍔ㄦ�佽垂鐢�
feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ BigDecimal amount = new BigDecimal(feeDto.getAmount());
+ feeTotalPrice = amount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ } else if ("9009".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍔ㄦ�佸崟浠�+闄勫姞璐�
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ //throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getMwPrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ }
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
}
@@ -735,6 +1112,7 @@
String computingFormula = feeDto.getComputingFormula();
OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
ownerCarDto.setCommunityId(feeDto.getCommunityId());
ownerCarDto.setCarId(feeDto.getPayerObjId());
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
@@ -750,13 +1128,49 @@
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_EVEN);
+ feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, 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_EVEN);
- } else if ("4004".equals(computingFormula)) {
+ feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ } else if ("1102".equals(computingFormula)) { // 绉熼噾
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
+ feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ }else if ("4004".equals(computingFormula)) {
feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ BigDecimal amount = new BigDecimal(feeDto.getAmount());
+ feeTotalPrice = amount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
} else if ("5005".equals(computingFormula)) {
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
@@ -768,17 +1182,171 @@
BigDecimal sub = curDegree.subtract(preDegree);
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
- .setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
}
} else if ("6006".equals(computingFormula)) {
feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ BigDecimal amount = new BigDecimal(feeDto.getAmount());
+ feeTotalPrice = amount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
} else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
feePrice = computeCarCustomizeFormula(feeDto, ownerCarDtos.get(0));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = feePrice.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ } else if ("9009".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍔ㄦ�佸崟浠�+闄勫姞璐�
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ //throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getMwPrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ }
+ } else {
+ throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
+ }
+ } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(feeDto.getPayerObjType())) { //鍚堝悓鐩稿叧
+ String computingFormula = feeDto.getComputingFormula();
+
+ //鏌ヨ鍚堝悓鍏宠仈鎴垮眿
+ ContractRoomDto contractRoomDto = new ContractRoomDto();
+ contractRoomDto.setContractId(feeDto.getPayerObjId());
+ contractRoomDto.setCommunityId(feeDto.getCommunityId());
+ List<ContractRoomDto> contractRoomDtos = contractRoomInnerServiceSMOImpl.queryContractRooms(contractRoomDto);
+
+ if ("1001".equals(computingFormula)) { //闈㈢Н*鍗曚环+闄勫姞璐�
+ //feePrice = Double.parseDouble(feeDto.getSquarePrice()) * Double.parseDouble(roomDtos.get(0).getBuiltUpArea()) + Double.parseDouble(feeDto.getAdditionalAmount());
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
+ BigDecimal builtUpArea = new BigDecimal(0);
+ for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
+ builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getBuiltUpArea())));
+ }
+ feeDto.setBuiltUpArea(builtUpArea.doubleValue() + "");
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ }else if ("1102".equals(computingFormula)) { // 绉熼噾
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
+ feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ } else if ("4004".equals(computingFormula)) { //鍔ㄦ�佽垂鐢�
+ feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ BigDecimal amount = new BigDecimal(feeDto.getAmount());
+ feeTotalPrice = amount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ } else if ("5005".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍗曚环+闄勫姞璐�
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ //throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
+ } 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_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ }
+ } else if ("6006".equals(computingFormula)) {
+ feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ BigDecimal amount = new BigDecimal(feeDto.getAmount());
+ feeTotalPrice = amount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ } else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
+ feePrice = computeContractCustomizeFormula(feeDto, contractRoomDtos);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = feePrice.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ } else if ("8008".equals(computingFormula)) { //鎵嬪姩鍔ㄦ�佽垂鐢�
+ feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ BigDecimal amount = new BigDecimal(feeDto.getAmount());
+ feeTotalPrice = amount.multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ } else if ("9009".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍔ㄦ�佸崟浠�+闄勫姞璐�
+ if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ //throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
+ } else {
+ BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+ BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getMwPrice()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ BigDecimal sub = curDegree.subtract(preDegree);
+ feePrice = sub.multiply(squarePrice)
+ .add(additionalAmount)
+ .setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = sub.multiply(squarePrice).add(additionalAmount).multiply(cycle1).setScale(3, BigDecimal.ROUND_HALF_UP);
+ }
+ }
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
}
}
- return feePrice.setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+
+ feePrice.setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
+ feeAmount.put("feePrice", feePrice);
+ feeAmount.put("feeTotalPrice", feeTotalPrice);
+ return feeAmount;
}
/**
@@ -840,6 +1408,26 @@
* 鑷畾涔夊叕寮忚绠�
*
* @param feeDto
+ * @return C 浠ｈ〃鎴垮眿瀵瑰簲灏忓尯闈㈢Н
+ * F 浠ｈ〃鎴垮眿瀵瑰簲妤兼爧闈㈢Н
+ * U 浠ｈ〃鎴垮眿瀵瑰簲鍗曞厓闈㈢Н
+ * R 浠ｈ〃鎴垮眿闈㈢Н
+ * X 浠ｈ〃鎴垮眿鏀惰垂绯绘暟锛堟埧灞嬬鐞嗕腑閰嶇疆锛�
+ * L 浠ｈ〃鎴垮眿灞傛暟
+ */
+ private BigDecimal computeContractCustomizeFormula(FeeDto feeDto, List<ContractRoomDto> contractRoomDtos) {
+
+ BigDecimal total = new BigDecimal(0.0);
+ for (ContractRoomDto contractRoomDto : contractRoomDtos) {
+ total = total.add(computeRoomCustomizeFormula(feeDto, contractRoomDto));
+ }
+ return total;
+ }
+
+ /**
+ * 鑷畾涔夊叕寮忚绠�
+ *
+ * @param feeDto
* @param roomDto
* @return C 浠ｈ〃鎴垮眿瀵瑰簲灏忓尯闈㈢Н
* F 浠ｈ〃鎴垮眿瀵瑰簲妤兼爧闈㈢Н
@@ -895,18 +1483,27 @@
}
+ /**
+ * 璁＄畻 璁¤垂缁撴潫鏃堕棿鍜� 娆犺垂鏈堜唤锛堝彲鑳藉瓨鍦ㄥ皬鏁扮偣锛�
+ *
+ * @param feeDto
+ * @param ownerCarDto
+ * @return
+ */
public Map getTargetEndDateAndOweMonth(FeeDto feeDto, OwnerCarDto ownerCarDto) {
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;
}
+ //褰撳墠璐圭敤涓轰竴娆℃�ц垂鐢�
+ Date maxEndTime = feeDto.getConfigEndTime();
if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
//鍏堝彇 deadlineTime
if (feeDto.getDeadlineTime() != null) {
@@ -914,37 +1511,21 @@
} else if (!StringUtil.isEmpty(feeDto.getCurDegrees())) {
targetEndDate = feeDto.getCurReadingTime();
} else if (feeDto.getImportFeeEndTime() == null) {
- targetEndDate = feeDto.getConfigEndTime();
+ targetEndDate = maxEndTime;
} 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())) {
- if (ownerCarDto == null) {
- targetEndDateAndOweMonth.put("oweMonth", 0);
- targetEndDateAndOweMonth.put("targetEndDate", "");
- return targetEndDateAndOweMonth;
- }
- targetEndDate = ownerCarDto.getEndTime();
- //璇存槑娌℃湁娆犺垂
- if (endDate.getTime() >= targetEndDate.getTime()) {
- // 鐩爣鍒版湡鏃堕棿 - 鍒版湡鏃堕棿 = 娆犺垂鏈堜唤
- oweMonth = 0;
- targetEndDateAndOweMonth.put("oweMonth", oweMonth);
- targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
- return targetEndDateAndOweMonth;
- }
+ }else if(FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())){
+ if(feeDto.getDeadlineTime() != null) {
+ maxEndTime = feeDto.getDeadlineTime();
}
-
+ Date billEndTime = DateUtil.getCurrentDate();
+ //寤鸿处鏃堕棿
+ Date startDate = feeDto.getStartTime();
+ //璁¤垂璧峰鏃堕棿
+ Date endDate = feeDto.getEndTime();
//缂磋垂鍛ㄦ湡
long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
// 褰撳墠鏃堕棿 - 寮�濮嬫椂闂� = 鏈堜唤
@@ -953,18 +1534,53 @@
// 鏈堜唤/ 鍛ㄦ湡 = 杞暟锛堝悜涓婂彇鏁达級
double round = 0.0;
- if ("1200".equals(feeDto.getPaymentCd())) { // 棰勪粯璐�
+ if ("1200".equals(feeDto.getPaymentCd())) { // 1200棰勪粯璐�
round = Math.floor(mulMonth / paymentCycle) + 1;
- } else { //鍚庝粯璐�
+ } else { //2100鍚庝粯璐�
round = Math.floor(mulMonth / paymentCycle);
}
// 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
- targetEndDate = getTargetEndTime(round * paymentCycle, startDate);
- //璐圭敤 蹇粨鏉熶簡
- if (feeDto.getConfigEndTime().getTime() < targetEndDate.getTime()) {
- targetEndDate = feeDto.getConfigEndTime();
+ targetEndDate = getTargetEndTime(round * paymentCycle, startDate);//鐩爣缁撴潫鏃堕棿
+ //璐圭敤椤圭殑缁撴潫鏃堕棿<缂磋垂鐨勭粨鏉熸椂闂� 璐圭敤蹇粨鏉熶簡 鍙栬垂鐢ㄩ」鐨勭粨鏉熸椂闂�
+ 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);
@@ -982,16 +1598,23 @@
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));
- }
+// 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;
@@ -999,31 +1622,39 @@
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
+ //濡傛灉鍔犳湀浠藉悗 澶т簬浜嗗綋鍓嶆椂闂� 榛樿鍔� 鏈堜唤 -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 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);
- //鍦ㄥ綋鍓嶆湀涓�
+ newFromMaxDay.add(Calendar.MONTH, 1); //涓嬩釜鏈�1鍙�
+ //鍦ㄥ綋鍓嶆湀涓� 杩欏潡鏈夐棶棰�
if (toDate.getTime() < newFromMaxDay.getTime().getTime()) {
- monthDay = new BigDecimal(newFromMaxDay.getActualMaximum(Calendar.DAY_OF_MONTH));
+ monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
return tmpDays.divide(monthDay, 2, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).doubleValue();
}
// 涓婃湀澶╂暟
@@ -1040,6 +1671,30 @@
return resMonth;
}
+
+ //鎵嬫満绔即璐瑰鐞�
+ public Map getOwnerPhoneFee(Map feeAmount) {
+ feeAmount.put("feePrice", new BigDecimal(1.00 / 100));
+ feeAmount.put("feeTotalPrice", new BigDecimal(1.00 / 100));
+ return feeAmount;
+ }
+
+
+ /**
+ * 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
+ */
+ public long daysBetween(Date smdate, Date bdate) {
+ long between_days = 0;
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(smdate);
+ long time1 = cal.getTimeInMillis();
+ cal.setTime(bdate);
+ long time2 = cal.getTimeInMillis();
+ between_days = (time2 - time1) / (1000 * 3600 * 24);
+
+ return between_days;
+ }
+
@Override
public Date getTargetEndTime(double month, Date startDate) {
Calendar endDate = Calendar.getInstance();
@@ -1051,31 +1706,50 @@
if (doubleMonth <= 0) {
return endDate.getTime();
}
-// Calendar futureDate = Calendar.getInstance();
-// futureDate.setTime(endDate.getTime());
-// futureDate.add(Calendar.MONTH, 1);
int futureDay = endDate.getActualMaximum(Calendar.DAY_OF_MONTH);
Double hour = doubleMonth * futureDay * 24;
endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
return endDate.getTime();
}
- public static void main(String[] args) {
- ComputeFeeSMOImpl computeFeeSMO = new ComputeFeeSMOImpl();
- try {
- double month = computeFeeSMO.dayCompare(
- DateUtil.getDateFromString("2020-12-19 00:00:00", DateUtil.DATE_FORMATE_STRING_A),
- DateUtil.getDateFromString("2021-1-10 00:00:00", DateUtil.DATE_FORMATE_STRING_A)
- );
+ @Override
+ public List<CarInoutDto> computeTempCarStopTimeAndFee(List<CarInoutDto> carInoutDtos) {
- System.out.println(month);
- } catch (ParseException e) {
- e.printStackTrace();
+ if (carInoutDtos == null || carInoutDtos.size() < 1) {
+ return null;
}
+
+
+ carInoutDtos = tempCarFeeConfigInnerServiceSMOImpl.computeTempCarFee(carInoutDtos);
+
+ return carInoutDtos;
+
}
+ @Override
+ public List<CarInoutDetailDto> computeTempCarInoutDetailStopTimeAndFee(List<CarInoutDetailDto> carInoutDtos) {
+ if (carInoutDtos == null || carInoutDtos.size() < 1) {
+ return null;
+ }
+
+
+ carInoutDtos = tempCarFeeConfigInnerServiceSMOImpl.computeTempCarInoutDetailFee(carInoutDtos);
+
+ return carInoutDtos;
+ }
+
+
// public static void main(String[] args) {
+// BigDecimal squarePrice = new BigDecimal(Double.parseDouble("4.50"));
+// BigDecimal builtUpArea = new BigDecimal(Double.parseDouble("52.69"));
+// BigDecimal additionalAmount = new BigDecimal(Double.parseDouble("0"));
+// BigDecimal cycle = new BigDecimal(Double.parseDouble("3"));
+// BigDecimal feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_HALF_DOWN);
+// System.out.println(feeTotalPrice.doubleValue());
+// }
+
+ // public static void main(String[] args) {
// ComputeFeeSMOImpl computeFeeSMO = new ComputeFeeSMOImpl();
// try {
// Date startTime = DateUtil.getDateFromString("2020-12-31 00:00:00", DateUtil.DATE_FORMATE_STRING_A);
@@ -1088,4 +1762,216 @@
// e.printStackTrace();
// }
// }
+ static int[] getDiff(LocalDate start, LocalDate end) {
+
+ if (!start.isBefore(end)) {
+ throw new IllegalArgumentException("Start must not be before end.");
+ }
+
+ int year1 = start.getYear();
+ int month1 = start.getMonthValue();
+ int day1 = start.getDayOfMonth();
+
+ int year2 = end.getYear();
+ int month2 = end.getMonthValue();
+ int day2 = end.getDayOfMonth();
+
+ int yearDiff = year2 - year1; // yearDiff >= 0
+ int monthDiff = month2 - month1;
+
+ int dayDiff = day2 - day1;
+
+ if (dayDiff < 0) {
+ LocalDate endMinusOneMonth = end.minusMonths(1); // end 鐨勪笂涓�涓湀
+ int monthDays = endMinusOneMonth.lengthOfMonth(); // 璇ユ湀鐨勫ぉ鏁�
+
+ dayDiff += monthDays; // 鐢ㄤ笂涓�涓湀鐨勫ぉ鏁拌ˉ涓婅繖涓湀宸帀鐨勬棩瀛�
+
+ if (monthDiff > 0) { // eg. start is 2018-04-03, end is 2018-08-01
+ monthDiff--;
+
+ } else { // eg. start is 2018-04-03, end is 2019-02-01
+ monthDiff += 11;
+ yearDiff--;
+
+ }
+ }
+
+ int[] diff = new int[2];
+
+ diff[0] = yearDiff * 12 + monthDiff;
+ diff[1] = dayDiff;
+
+ return diff;
+ }
+
+ /**
+ * 璁＄畻涓や釜鏃ユ湡鐨勬椂闂村樊
+ *
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ public Map<String, Object> dateDiff(Date startDate, String endDate) {
+ Map<String, Object> cycle = new HashMap<>();
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date endDates = null;
+ try {
+ endDates = format.parse(endDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ LocalDate start = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ Calendar calendar = new GregorianCalendar();
+ calendar.setTime(endDates);
+ calendar.add(calendar.DATE, 1);
+ Date date = calendar.getTime();
+ LocalDate end = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ int[] diff = getDiff(start, end);
+ cycle.put("months", diff[0]);//鍑犱釜鏈�
+ cycle.put("days", diff[1]);//鍑犲ぉ
+ String startDateString = format.format(startDate);
+ String endDateString = format.format(endDates);
+ cycle.put("startMonthDays", getDayOfMonth(startDateString));//寮�濮嬫湀浠藉ぉ鏁�
+ cycle.put("endMonthDays", getDayOfMonth(endDateString));//缁撴潫鏈堜唤澶╂暟
+ cycle.put("isOneMonth", false);// false 涓嶈法鏈� true鏈堜唤
+ if (diff[0] == 0) {
+ //鍒ゆ柇鏄惁鍚屼竴涓湀
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ String date1 = sdf.format(startDate);
+ String date2 = sdf.format(endDates);
+ if (!date1.equals(date2)) {
+ cycle.put("isOneMonth", true);
+ //璁＄畻澶告湀鍒嗕袱涓湀鍒嗗埆鏄灏戝ぉ
+ SimpleDateFormat sdfday = new SimpleDateFormat("dd");
+ Integer startDate1 = Integer.valueOf(sdfday.format(startDate));
+ String endDates2 = sdfday.format(endDates);
+ cycle.put("startEndOfMonth", getDayOfMonth(startDateString) - startDate1 + 1);//寮�濮嬫湀浠藉ぉ鏁�
+ cycle.put("endBeginningOfMonth", Integer.valueOf(endDates2));//缁撴潫鏈堜唤澶╂暟
+ }
+ }
+ return cycle;
+
+ }
+
+ /**
+ * 鑾峰彇鏃ユ湡鍐呯殑澶╂暟
+ *
+ * @param dateStr
+ * @return
+ */
+ public int getDayOfMonth(String dateStr) {
+ int year = Integer.parseInt(dateStr.substring(0, 4));
+ int month = Integer.parseInt(dateStr.substring(5, 7));
+ Calendar c = Calendar.getInstance();
+ c.set(year, month, 0); //杈撳叆绫诲瀷涓篿nt绫诲瀷
+ return c.get(Calendar.DAY_OF_MONTH);
+ }
+
+ /**
+ *
+ * @param feeDto
+ * @param cycle
+ */
+ public void dealRentRateCycle(FeeDto feeDto,double cycle){
+ Date endTime = feeDto.getEndTime();
+ Date date = getTargetEndTime(cycle,endTime);
+ feeDto.setDeadlineTime(date);
+ dealRentRate(feeDto);
+
+ }
+
+ /**
+ * 绉熼噾澶勭悊
+ *
+ * @param feeDto
+ */
+ public void dealRentRate(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());
+ rate = Double.parseDouble(tmpFeeAttrDto.getValue());
+ }
+ if (FeeAttrDto.SPEC_CD_RATE_CYCLE.equals(tmpFeeAttrDto.getSpecCd())) {
+ feeDto.setRateCycle(tmpFeeAttrDto.getValue());
+ rateCycle = Integer.parseInt(tmpFeeAttrDto.getValue());
+ }
+ if (FeeAttrDto.SPEC_CD_RATE_START_TIME.equals(tmpFeeAttrDto.getSpecCd())) {
+ feeDto.setRateStartTime(tmpFeeAttrDto.getValue());
+ rateStartTime = DateUtil.getDateFromString(tmpFeeAttrDto.getValue(), 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());
+ if (feeDto.getEndTime().getTime() < rateStartTime.getTime()) {
+ curOweMonth = dayCompare(feeDto.getEndTime(), rateStartTime);
+ oweAmountDec = curFeePrice.multiply(new BigDecimal(curOweMonth)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ }
+
+ curOweMonth = dayCompare(rateStartTime, feeDto.getDeadlineTime());
+
+ double maxCycle = Math.floor(curOweMonth / rateCycle);
+
+ //鍩哄噯
+ BigDecimal firstAmount = curFeePrice.multiply(new BigDecimal(rateCycle));
+ BigDecimal preCycleAmount = firstAmount;
+ BigDecimal rateDec = null; //閫掑鍛ㄦ湡鎵�鏀惰垂鐢�
+ BigDecimal lastRateAmountDec = null;
+ double curCycle = 0;
+ for (int cycleIndex = 0; cycleIndex < maxCycle; maxCycle++) {
+ rateDec = preCycleAmount.multiply(new BigDecimal(rate)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ //澧為暱鍛ㄦ湡鐨勫�嶆暟
+ curCycle = (cycleIndex + 1) * rateCycle;
+ if (curCycle > curOweMonth) {
+ rateDec = new BigDecimal(curOweMonth / rateCycle - Math.ceil(curOweMonth / rateCycle)).multiply(rateDec).setScale(2, BigDecimal.ROUND_HALF_UP);
+ lastRateAmountDec = new BigDecimal(curOweMonth / rateCycle - Math.ceil(curOweMonth / rateCycle)).multiply(preCycleAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+ firstAmount = firstAmount.add(rateDec).add(lastRateAmountDec);
+ continue;
+ }
+ firstAmount = firstAmount.add(rateDec).add(preCycleAmount);
+ preCycleAmount = preCycleAmount.add(rateDec);
+ }
+
+ firstAmount = firstAmount.add(oweAmountDec);
+ feeDto.setAmountOwed(firstAmount.doubleValue() + "");
+ feeDto.setFeeTotalPrice(firstAmount.doubleValue());
+ }
}
+
--
Gitblit v1.8.0