|
|
@@ -362,7 +362,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
|
//生成预览账单(补录第二步,第三步走编辑) |
|
|
//生成预览账单(补录第二步,第三步走编辑) |
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { |
|
|
|
|
|
|
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) { |
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
//重新生成 |
|
|
//重新生成 |
|
|
List<WxBillRent> resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); |
|
|
List<WxBillRent> resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); |
|
|
@@ -389,7 +389,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
|
if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { |
|
|
if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { |
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { |
|
|
|
|
|
|
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) { |
|
|
//删除预账单,重新生成 |
|
|
//删除预账单,重新生成 |
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); |
|
|
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); |
|
|
@@ -601,15 +601,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public static void main(String[] args) throws Exception{ |
|
|
|
|
|
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
|
|
String start = "2019-05-18"; |
|
|
|
|
|
String end = "2019-05-24"; |
|
|
|
|
|
int[] array = DateUtils.getDiff(sd.parse(start),sd.parse(end)); |
|
|
|
|
|
System.out.println(array[0] +"月"); |
|
|
|
|
|
System.out.println(array[1] +"天"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public Object getMerchants(WxRentContract wxRentContract) { |
|
|
public Object getMerchants(WxRentContract wxRentContract) { |
|
|
List<WxRentContract> rentContractList = wxRentContractMapper.getMerchants(wxRentContract); |
|
|
List<WxRentContract> rentContractList = wxRentContractMapper.getMerchants(wxRentContract); |
|
|
|