From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 fa89a2c..9810b14 100644
--- 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
@@ -281,7 +281,7 @@
}
feeReceiptDetailPo.setArea(value);
feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
- }else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
+ } else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
@@ -567,9 +567,9 @@
}
} 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 {
+ } else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
+ feePrice = computeRoomCustomizeFormula(BeanConvertUtil.covertBean(tmpReportFeeDto, FeeDto.class), BeanConvertUtil.covertBean(reportRoomDto, RoomDto.class));
+ } else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
}
} else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(tmpReportFeeDto.getPayerObjType())) {//杞︿綅鐩稿叧
@@ -601,9 +601,9 @@
}
} 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 {
+ } else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
+ feePrice = computeCarCustomizeFormula(BeanConvertUtil.covertBean(tmpReportFeeDto, FeeDto.class), BeanConvertUtil.covertBean(reportCarDto, OwnerCarDto.class));
+ } else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
}
}
@@ -659,6 +659,8 @@
feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
} else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
feePrice = computeRoomCustomizeFormula(feeDto, roomDto);
+ } else if ("8008".equals(computingFormula)) { //鎵嬪姩鍔ㄦ�佽垂鐢�
+ feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
}
@@ -703,7 +705,7 @@
}
} else if ("6006".equals(computingFormula)) {
feePrice = new BigDecimal(Double.parseDouble(feeDto.getAmount()));
- }else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
+ } else if ("7007".equals(computingFormula)) { //鑷畾涔夊叕寮�
feePrice = computeCarCustomizeFormula(feeDto, ownerCarDtos.get(0));
} else {
throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍏紡");
@@ -713,9 +715,10 @@
}
/**
- * C 浠ｈ〃鎴垮眿瀵瑰簲灏忓尯闈㈢Н
-
- * R 浠ｈ〃鎴垮眿闈㈢Н
+ * C 浠ｈ〃鎴垮眿瀵瑰簲灏忓尯闈㈢Н
+ * <p>
+ * R 浠ｈ〃鎴垮眿闈㈢Н
+ *
* @param feeDto
* @param ownerCarDto
* @return
@@ -743,7 +746,7 @@
if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
//throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒板仠杞︿綅淇℃伅锛屾煡璇㈠鏉℃暟鎹�");
value = value.replace("R", "0");
- }else {
+ } else {
value = value.replace("R", parkingSpaceDtos.get(0).getArea());
}
}
@@ -759,7 +762,7 @@
valueObj = new BigDecimal(0);
}
- if(valueObj.doubleValue() < 0){
+ if (valueObj.doubleValue() < 0) {
return new BigDecimal(0);
}
@@ -817,7 +820,7 @@
valueObj = new BigDecimal(0);
}
- if(valueObj.doubleValue() < 0){
+ if (valueObj.doubleValue() < 0) {
return new BigDecimal(0);
}
--
Gitblit v1.8.0