diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java index 4c2aeaceb..34f5f3b80 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java @@ -5,16 +5,16 @@ import java.util.List; public enum EnumBillAllType { - RENT(1,"租金",1L,false), - RENT_BUSSINESS_MANAGE(11,"商业管理费",2L,false), - RENT_OPERATION_MANAGE(12,"运营管理费",3L,false), - RENT_DEPOSIT(13,"租赁押金",null,true), - PROPERTY(2,"物业",5L,false), - PROPERTY_DEPOSIT(21,"物业押金",6L,true), - DAILY(3, "能耗(水电空调)费",null,false), - OTHER(4, "其他费用",null,false), - OTHER_DEPOSIT(5, "其他押金",null,true), - ADVANCE(6,"预收",null,true)//没有形成真正的账单 + RENT(1,"租金",1L,false,false), + RENT_BUSSINESS_MANAGE(11,"商业管理费",2L,false,false), + RENT_OPERATION_MANAGE(12,"运营管理费",3L,false,false), + RENT_DEPOSIT(13,"租赁押金",null,true,true), + PROPERTY(2,"物业",5L,false,false), + PROPERTY_DEPOSIT(21,"物业押金",6L,true,true), + DAILY(3, "能耗(水电空调)费",null,false,false), + OTHER(4, "临时费用",null,false,false), + OTHER_DEPOSIT(5, "临时押金",null,true,true), + ADVANCE(6,"预收",null,true,false)//没有形成真正的账单 ; public static EnumBillAllType getEnum(Integer code) { @@ -30,12 +30,15 @@ public enum EnumBillAllType { private String message; private Long energyFeesId;//wx_energy_fees(费用科目)里的id,不可配置的有这个 private boolean isFixedPrice;//是否强制为一次性费用 + private boolean isDeposit;//是否强制是押金类型 + - EnumBillAllType(Integer code, String message,Long energyFeesId,boolean isFixedPrice) { + EnumBillAllType(Integer code, String message,Long energyFeesId,boolean isFixedPrice,boolean isDeposit) { this.code = code; this.message = message; this.energyFeesId = energyFeesId; this.isFixedPrice = isFixedPrice; + this.isDeposit = isDeposit; } public Integer getCode() { @@ -54,6 +57,10 @@ public enum EnumBillAllType { return isFixedPrice; } + public boolean isDeposit() { + return isDeposit; + } + public static EnumBillAllType[] getDepositTypes() { EnumBillAllType[] ret = new EnumBillAllType[] {RENT_DEPOSIT,PROPERTY_DEPOSIT,OTHER_DEPOSIT}; return ret;