Sfoglia il codice sorgente

[租赁合同][修改][生成账单非欠缴状态欠缴金额默认0]

release_toaliyun_real
gongbiao 7 anni fa
parent
commit
4526d492c7
2 ha cambiato i file con 5 aggiunte e 3 eliminazioni
  1. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Vedi File

@@ -674,7 +674,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
} }


wxBillProperty.setNeedPay(needpay); wxBillProperty.setNeedPay(needpay);
wxBillProperty.setOwe(needpay);
wxBillProperty.setOwe(0L);
wxBillProperty.setReceivePay(needpay); wxBillProperty.setReceivePay(needpay);


//截止收租日在当前时间之前 //截止收租日在当前时间之前
@@ -682,6 +682,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillProperty.setExpiredDay(day); wxBillProperty.setExpiredDay(day);
wxBillProperty.setOwe(needpay);
} else {//截止收租日在当前时间之后 } else {//截止收租日在当前时间之后
Calendar now = Calendar.getInstance(); Calendar now = Calendar.getInstance();
now.add(dayType, receivePeriod); now.add(dayType, receivePeriod);
@@ -695,7 +696,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillProperty.setExpiredDay(0L); wxBillProperty.setExpiredDay(0L);
} }
} }
wxBillProperty.setRevenue(0L);
wxBillProperty.setTenantId(wxMerchant.getTenantId()); wxBillProperty.setTenantId(wxMerchant.getTenantId());
wxBillProperty.setIsDel(0); wxBillProperty.setIsDel(0);
wxBillProperty.setMerchantId(wxMerchant.getId()); wxBillProperty.setMerchantId(wxMerchant.getId());


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Vedi File

@@ -1065,7 +1065,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }


wxBillRent.setNeedPay(needpay); wxBillRent.setNeedPay(needpay);
wxBillRent.setOwe(needpay);
wxBillRent.setOwe(0L);
wxBillRent.setReceivePay(needpay); wxBillRent.setReceivePay(needpay);


//截止收租日在当前时间之前 //截止收租日在当前时间之前
@@ -1073,6 +1073,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillRent.setExpiredDay(day); wxBillRent.setExpiredDay(day);
wxBillRent.setOwe(needpay);
} else {//截止收租日在当前时间之后 } else {//截止收租日在当前时间之后
Calendar now = Calendar.getInstance(); Calendar now = Calendar.getInstance();
now.add(dayType, receivePeriod); now.add(dayType, receivePeriod);


Caricamento…
Annulla
Salva