Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
064ffb64a6
2 changed files with 3 additions and 1 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java View File

@@ -8,7 +8,7 @@ public enum EnumBillAllType {
RENT(1,"租金",1L,false),
RENT_BUSSINESS_MANAGE(11,"商业管理费",2L,false),
RENT_OPERATION_MANAGE(12,"运营管理费",3L,false),
RENT_DEPOSIT(13,"租赁押金",null,false),
RENT_DEPOSIT(13,"租赁押金",null,true),
PROPERTY(2,"物业",5L,false),
PROPERTY_DEPOSIT(21,"物业押金",6L,true),
DAILY(3, "能耗(水电空调)费",null,false),


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -1917,6 +1917,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (timeVo.getEndDate().after(yearEndDate)) {
timeVo.setEndDate(yearEndDate);
yearsEndList.remove(yearEndDate);
}else if(timeVo.getEndDate().equals(yearEndDate)) {
yearsEndList.remove(yearEndDate);
}
}


Loading…
Cancel
Save