Просмотр исходного кода

[押金][修改][生成账单时状态为待缴(未缴)]

release_toaliyun_real
gongbiao 7 лет назад
committed by Stormeye Wu
Родитель
Сommit
aad9348334
2 измененных файлов: 5 добавлений и 24 удалений
  1. +2
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +3
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 11
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -14,7 +14,6 @@ import com.iformall.service.WxFlowRecordService;
import com.iformall.service.WxFlowService;
import com.iformall.service.WxPropertyContractService;
import com.iformall.utils.Constant;
import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -372,16 +371,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
instance.setTime(wxBillDeposit.getReceiveDate());
instance.add(dayType, wxPropertyContract.getLease());
wxBillDeposit.setEndtime(instance.getTime());
//截止收租日在当前时间之前
if (wxBillDeposit.getReceiveDate().before(date)) {
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
wxBillDeposit.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillDeposit.setExpiredDay(day);
} else {
wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
wxBillDeposit.setExpiredDay(0L);
}

wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
wxBillDeposit.setExpiredDay(0L);
wxBillDeposit.setTenantId(wxMerchant.getTenantId());
wxBillDeposit.setIsDel(0);
wxBillDeposit.setMerchantId(wxMerchant.getId());


+ 3
- 13
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -417,19 +417,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
instance.setTime(wxBillDeposit.getReceiveDate());
instance.add(dayType, wxRentContract.getLease());
wxBillDeposit.setEndtime(instance.getTime());

//截止收租日在当前时间之前
if (wxBillDeposit.getReceiveDate().before(date)) {
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
wxBillDeposit.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillDeposit.setExpiredDay(day);
wxBillDeposit.setReceiveDate(time);
} else {
wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
wxBillDeposit.setExpiredDay(0L);
wxBillDeposit.setReceiveDate(time);
}

wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
wxBillDeposit.setExpiredDay(0L);
wxBillDeposit.setReceiveDate(time);
wxBillDeposit.setTenantId(wxMerchant.getTenantId());
wxBillDeposit.setIsDel(0);
wxBillDeposit.setMerchantId(wxMerchant.getId());


Загрузка…
Отмена
Сохранить