diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java index 493f0de89..6767d2f43 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java @@ -11,10 +11,6 @@ public class WaitMerchantVo { @Excel(name="商户名",width = 20,orderNum = "1") private String name; - @Excel(name="楼座",width = 20,orderNum = "2") - private String building; - @Excel(name="楼层",width = 20,orderNum = "3") - private String floor; @Excel(name="负责人",width = 20,orderNum = "4") private String linkPerson; @Excel(name="负责人电话",width = 20,orderNum = "5") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 8c9abbf79..72069aad3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -948,8 +948,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { List list = new ArrayList<>(); for (Map map:data) { WaitMerchantVo oweMerchantVo = new WaitMerchantVo(); - oweMerchantVo.setBuilding((String)map.get("building")); - oweMerchantVo.setFloor((String)map.get("floor")); oweMerchantVo.setLinkPerson((String)map.get("manager")); oweMerchantVo.setName((String)map.get("merchantName")); oweMerchantVo.setLinkPhone((String)map.get("managerPhone")); 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 247ff8278..925a5c9bd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -904,6 +904,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { && !isFirstDay(wxRentContract.getRentalStartDate()) && (wxRentContract.getLease() % wxRentContract.getReceivePeriod() == 0) && isLastYesr + ){ paycount ++; } @@ -1081,6 +1082,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRent.setEndtime(wxRentContract.getRentalEndDate()); } + SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd"); + System.out.println(s.format(wxBillRent.getStarttime())); + System.out.println(s.format(wxBillRent.getEndtime())); int[] diff = DateUtils.getDiff(wxBillRent.getStarttime(),wxBillRent.getEndtime()); needpay = diff[0]*price;