diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 61e86c3ee..db96b895e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -346,7 +346,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if(!haspreview){ 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)) { //删除预账单,重新生成 wxBillPropertyMapper.deletePreviewBill(record); //重新生成 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 265c05f24..247ff8278 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -362,7 +362,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //生成预览账单(补录第二步,第三步走编辑) 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); //重新生成 List resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); @@ -389,7 +389,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { 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)) { + && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) { //删除预账单,重新生成 wxBillRentMapper.deletePreviewBill(record); 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 public Object getMerchants(WxRentContract wxRentContract) { List rentContractList = wxRentContractMapper.getMerchants(wxRentContract); diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 3af51c18b..a0fb63e86 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -166,6 +166,7 @@ update wx_bill_property set updatetime = now() ,receive_pay = #{receivePay},owe=#{receivePay} ,comments = #{comments} + ,receive_date = #{receiveDate} where id = #{id} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index dc30b2dee..c3ad9f0b8 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -166,6 +166,7 @@ update wx_bill_rent set updatetime = now() ,receive_pay = #{receivePay} ,comments = #{comments} + ,receive_date = #{receiveDate} where id = #{id}