From 5d19f731a7f3b9f55ebe66f6bcc2d1dae8870013 Mon Sep 17 00:00:00 2001
From: 颓废太子 <1098226878@qq.com>
Date: 星期三, 24 十一月 2021 10:26:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 209 insertions(+), 22 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
index b413d37..aae9a18 100755
--- 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
@@ -6,6 +6,8 @@
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;
@@ -16,6 +18,8 @@
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
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;
@@ -75,6 +79,12 @@
@Autowired(required = false)
private IContractInnerServiceSMO contractInnerServiceSMOImpl;
+ @Autowired(required = false)
+ private ITempCarFeeConfigInnerServiceSMO tempCarFeeConfigInnerServiceSMOImpl;
+
+ @Autowired(required = false)
+ private ITempCarFeeConfigAttrInnerServiceSMO tempCarFeeConfigAttrInnerServiceSMOImpl;
+
@Override
public Date getFeeEndTime() {
return null;
@@ -93,6 +103,7 @@
public void computeEveryOweFee(FeeDto tmpFeeDto, RoomDto roomDto) {
computeFeePrice(tmpFeeDto, roomDto);
}
+
/**
* 璁＄畻娆犺垂閲戦
@@ -158,9 +169,9 @@
}
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());
@@ -187,8 +198,8 @@
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));
@@ -215,8 +226,8 @@
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));
@@ -262,7 +273,7 @@
} else if ("1101".equals(computingFormula)) { // 绉熼噾
feeReceiptDetailPo.setArea("");
feeReceiptDetailPo.setSquarePrice(roomDto.getRoomRent());
- }else if ("4004".equals(computingFormula)) {
+ } else if ("4004".equals(computingFormula)) {
} else if ("5005".equals(computingFormula)) {
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
} else {
@@ -322,7 +333,7 @@
} else if ("1101".equals(computingFormula)) { // 绉熼噾
feeReceiptDetailPo.setArea("");
feeReceiptDetailPo.setSquarePrice("0");
- }else if ("4004".equals(computingFormula)) {
+ } else if ("4004".equals(computingFormula)) {
} else if ("5005".equals(computingFormula)) {
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
} else {
@@ -399,7 +410,7 @@
}
feeReceiptDetailPo.setArea(builtUpArea.doubleValue() + "");
feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
- }else if ("4004".equals(computingFormula)) {
+ } else if ("4004".equals(computingFormula)) {
} else if ("5005".equals(computingFormula)) {
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
} else {
@@ -789,7 +800,7 @@
} else if ("1101".equals(computingFormula)) { // 绉熼噾
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpReportFeeDto.getRoomRent()));
feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_EVEN);
- }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())) {
@@ -841,7 +852,7 @@
feePrice = new BigDecimal(0);
} else if ("1101".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())) {
@@ -881,13 +892,15 @@
}
@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 (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
String computingFormula = feeDto.getComputingFormula();
if (roomDto == null) {
@@ -896,7 +909,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);
}
@@ -906,20 +919,41 @@
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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} 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_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} else if ("1101".equals(computingFormula)) { // 绉熼噾
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} 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_DOWN);
+ }
} else if ("5005".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍗曚环+闄勫姞璐�
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
//throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
@@ -932,13 +966,32 @@
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
.setScale(2, BigDecimal.ROUND_HALF_EVEN);
+
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
}
} 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_DOWN);
+ }
} 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_DOWN);
+ }
} 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_DOWN);
+ }
} else if ("9009".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍔ㄦ�佸崟浠�+闄勫姞璐�
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
//throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
@@ -951,6 +1004,10 @@
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
.setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
}
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
@@ -959,6 +1016,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);
@@ -975,20 +1033,41 @@
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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} 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);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} 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_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} else if ("1101".equals(computingFormula)) { // 绉熼噾
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_EVEN);
- }else if ("4004".equals(computingFormula)) {
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
+ } 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_DOWN);
+ }
} else if ("5005".equals(computingFormula)) {
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
@@ -1001,11 +1080,24 @@
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
.setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
}
} 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_DOWN);
+ }
} 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_DOWN);
+ }
} else if ("9009".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍔ㄦ�佸崟浠�+闄勫姞璐�
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
//throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
@@ -1018,6 +1110,10 @@
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
.setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
}
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
@@ -1041,22 +1137,43 @@
feeDto.setBuiltUpArea(builtUpArea.doubleValue() + "");
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} 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_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} 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_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (squarePrice.multiply(builtUpArea).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
} else if ("1101".equals(computingFormula)) { // 绉熼噾
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_EVEN);
- }else if ("4004".equals(computingFormula)) { //鍔ㄦ�佽垂鐢�
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = additionalAmount.multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
+ } 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_DOWN);
+ }
} else if ("5005".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍗曚环+闄勫姞璐�
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
//throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
@@ -1069,13 +1186,31 @@
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
.setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = (sub.multiply(squarePrice).add(additionalAmount)).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
}
} 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_DOWN);
+ }
} 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_DOWN);
+ }
} 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_DOWN);
+ }
} else if ("9009".equals(computingFormula)) { //(鏈湡搴︽暟-涓婃湡搴︽暟)*鍔ㄦ�佸崟浠�+闄勫姞璐�
if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
//throw new IllegalArgumentException("鎶勮〃鏁版嵁寮傚父");
@@ -1088,12 +1223,19 @@
feePrice = sub.multiply(squarePrice)
.add(additionalAmount)
.setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ if (!StringUtil.isEmpty(feeDto.getCycle())) {
+ BigDecimal cycle1 = new BigDecimal(feeDto.getCycle());
+ feeTotalPrice = sub.multiply(squarePrice).add(additionalAmount).multiply(cycle1).setScale(3, BigDecimal.ROUND_DOWN);
+ }
}
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
}
}
- return feePrice.setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ feePrice.setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ feeAmount.put("feePrice", feePrice);
+ feeAmount.put("feeTotalPrice", feeTotalPrice);
+ return feeAmount;
}
/**
@@ -1232,6 +1374,7 @@
/**
* 璁＄畻 璁¤垂缁撴潫鏃堕棿鍜� 娆犺垂鏈堜唤锛堝彲鑳藉瓨鍦ㄥ皬鏁扮偣锛�
+ *
* @param feeDto
* @param ownerCarDto
* @return
@@ -1318,7 +1461,8 @@
/**
* 璁＄畻 涓や釜鏃堕棿鐐规湀浠�
- * @param fromDate 寮�濮嬫椂闂�
+ *
+ * @param fromDate 寮�濮嬫椂闂�
* @param toDate 缁撴潫鏃堕棿
* @return
*/
@@ -1378,6 +1522,21 @@
return resMonth;
}
+ /**
+ * 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
+ */
+ 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();
@@ -1395,14 +1554,42 @@
return endDate.getTime();
}
+
+ @Override
+ public List<CarInoutDto> computeTempCarStopTimeAndFee(List<CarInoutDto> carInoutDtos) {
+
+ 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) {
ComputeFeeSMOImpl computeFeeSMO = new ComputeFeeSMOImpl();
try {
double month = computeFeeSMO.dayCompare(
- DateUtil.getDateFromString("2021-6-1 00:00:00", DateUtil.DATE_FORMATE_STRING_A),
- DateUtil.getDateFromString("2021-8-5 18:00:00", DateUtil.DATE_FORMATE_STRING_A)
+ DateUtil.getDateFromString("2021-09-30 14:20:02", DateUtil.DATE_FORMATE_STRING_A),
+ DateUtil.getDateFromString("2021-11-03 14:20:02", DateUtil.DATE_FORMATE_STRING_A)
);
- System.out.println(month);
+ System.out.println(Math.ceil(month));
} catch (ParseException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0