|
|
|
@@ -344,11 +344,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
return resultData; |
|
|
|
} |
|
|
|
|
|
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { |
|
|
|
//删除预账单,重新生成 |
|
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
|
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); |
|
|
|
if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { |
|
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { |
|
|
|
//删除预账单,重新生成 |
|
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
|
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
/* //有改变,删除预账单,重新生成 |
|
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
|
|