| @@ -32,12 +32,18 @@ public class WxRentContractHelper { | |||||
| //计算商业管理费 | //计算商业管理费 | ||||
| public static long[] calcuteBussinessManagementFee(WxRentContract wxRentContract) { | public static long[] calcuteBussinessManagementFee(WxRentContract wxRentContract) { | ||||
| if ("[]".equals(StringUtils.trimToEmpty(wxRentContract.getBussinessManagementFeeRatio()))) { | |||||
| return null; | |||||
| } | |||||
| return calcuteOtherCanAdjustFeeByArea(wxRentContract,wxRentContract.getBussinessManagementFee(),wxRentContract.getBussinessManagementFeeRatioWay(), | return calcuteOtherCanAdjustFeeByArea(wxRentContract,wxRentContract.getBussinessManagementFee(),wxRentContract.getBussinessManagementFeeRatioWay(), | ||||
| wxRentContract.getBussinessManagementFeeRatio(),"bussinessManagementFee","bussinessManagementFeeRatio"); | wxRentContract.getBussinessManagementFeeRatio(),"bussinessManagementFee","bussinessManagementFeeRatio"); | ||||
| } | } | ||||
| //计算营业管理费 | //计算营业管理费 | ||||
| public static long[] calcuteOperatingManagementFee(WxRentContract wxRentContract) { | public static long[] calcuteOperatingManagementFee(WxRentContract wxRentContract) { | ||||
| if ("[]".equals(StringUtils.trimToEmpty(wxRentContract.getOperatingManagementFeeRatio()))) { | |||||
| return null; | |||||
| } | |||||
| return calcuteOtherCanAdjustFeeByArea(wxRentContract,wxRentContract.getOperatingManagementFee(),wxRentContract.getOperatingManagementFeeRatioWay(), | return calcuteOtherCanAdjustFeeByArea(wxRentContract,wxRentContract.getOperatingManagementFee(),wxRentContract.getOperatingManagementFeeRatioWay(), | ||||
| wxRentContract.getOperatingManagementFeeRatio(),"operatingManagementFee","operatingManagementFeeRatio"); | wxRentContract.getOperatingManagementFeeRatio(),"operatingManagementFee","operatingManagementFeeRatio"); | ||||
| } | } | ||||