|
|
|
@@ -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()); |
|
|
|
|