From fdcc179bafd640fa841da63cd8968dfa50dc7e85 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 23 May 2024 21:53:51 +0800 Subject: [PATCH] fix --- .../controller/rent/WxBillDailyController.java | 12 ++++++------ .../controller/rent/WxBillDepositController.java | 12 ++++++------ .../controller/rent/WxBillOtherController.java | 12 ++++++------ .../rent/WxBillOtherDepositController.java | 12 ++++++------ .../controller/rent/WxBillPropertyController.java | 12 ++++++------ .../rent/WxBillPropertyDepositController.java | 12 ++++++------ .../controller/rent/WxBillRentController.java | 12 ++++++------ .../controller/rent/WxBillRentManageController.java | 12 ++++++------ .../com/iformall/service/helper/WxBillAllHelper.java | 8 ++++---- .../service/impl/WxBillDailyServiceImpl.java | 4 ++-- .../service/impl/WxBillDepositServiceImpl.java | 4 ++-- .../service/impl/WxBillOtherDepositServiceImpl.java | 4 ++-- .../service/impl/WxBillOtherServiceImpl.java | 4 ++-- .../impl/WxBillPropertyDepositServiceImpl.java | 4 ++-- .../service/impl/WxBillRentManageServiceImpl.java | 4 ++-- .../iformall/service/impl/WxMerchantServiceImpl.java | 5 ++++- 16 files changed, 68 insertions(+), 65 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 2a05ab9a5..d50f86655 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -79,10 +79,10 @@ public class WxBillDailyController extends BillBaseController { } if (null != wxBillDaily.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { - wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { - wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } final PageInfo page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); @@ -99,10 +99,10 @@ public class WxBillDailyController extends BillBaseController { } if (null != wxBillDaily.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { - wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { - wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillDailyService.exportBill(request, response, wxBillDaily); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java index e117d4c35..66f272b6e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -58,10 +58,10 @@ public class WxBillDepositController extends BillBaseController { } if (null != wxBillDeposit.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { - wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { - wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } @@ -79,10 +79,10 @@ public class WxBillDepositController extends BillBaseController { } if (null != wxBillDeposit.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { - wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { - wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index 37d5382c9..654a23dc4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -56,10 +56,10 @@ public class WxBillOtherController extends BillBaseController { } if (null != wxBillOther.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { - wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { - wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillOther.updateTenantInfo(getTenantInfo()); @@ -77,10 +77,10 @@ public class WxBillOtherController extends BillBaseController { } if (null != wxBillOther.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { - wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { - wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillOtherService.exportBill(request, response, wxBillOther); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index c406e1fd0..12d810e7a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -56,10 +56,10 @@ public class WxBillOtherDepositController extends BillBaseController { } if (null != wxBillOtherDeposit.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { - wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { - wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); @@ -77,10 +77,10 @@ public class WxBillOtherDepositController extends BillBaseController { } if (null != wxBillOtherDeposit.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { - wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { - wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillOtherDepositService.exportBill(request, response, wxBillOtherDeposit); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 5b3c7b712..93e8c8ba8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -59,10 +59,10 @@ public class WxBillPropertyController extends BillBaseController { } if (null != wxBillProperty.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { - wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { - wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); @@ -80,10 +80,10 @@ public class WxBillPropertyController extends BillBaseController { } if (null != wxBillProperty.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { - wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { - wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillPropertyService.exportBill(request, response, wxBillProperty); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java index f206bd662..39b1d2e23 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -59,10 +59,10 @@ public class WxBillPropertyDepositController extends BillBaseController { } if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { - wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { - wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } @@ -80,10 +80,10 @@ public class WxBillPropertyDepositController extends BillBaseController { } if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { - wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { - wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index 83bdf66eb..071a5da51 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -58,10 +58,10 @@ public class WxBillRentController extends BillBaseController { } if (null != wxBillRent.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { - wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { - wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } @@ -80,10 +80,10 @@ public class WxBillRentController extends BillBaseController { } if (null != wxBillRent.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { - wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { - wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java index 6d2d8291a..cae6a907c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java @@ -60,10 +60,10 @@ public class WxBillRentManageController extends BillBaseController { } if (null != wxBillRentManage.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { - wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { - wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); @@ -81,10 +81,10 @@ public class WxBillRentManageController extends BillBaseController { } if (null != wxBillRentManage.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { - wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); + wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { - wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays())); - wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays())); + wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays())); + wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } wxBillRentManageService.exportBill(request, response, wxBillRentManage); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 67f70920c..e8f1aeb25 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -100,9 +100,9 @@ public class WxBillAllHelper { @Autowired private WxMallService wxMallService; - public Date getDateAfter(Integer afterDays) { + public Date getDateBefore(Integer afterDays) { Date nowBegin = DateUtils.getDayBegin(new Date()); - return DateUtils.getSecondsTimeAfter(afterDays*3600*24, nowBegin); + return DateUtils.getDateTimeBefore(afterDays*3600*24, nowBegin); } private void updateQueryParm(WxMerchant wxMerchant,WxBillBaseEntity bill,Date starttime,Date enttime) { @@ -117,10 +117,10 @@ public class WxBillAllHelper { bill.setEndtime(enttime); bill.setRentShopType(wxMerchant.getType()); if (null != wxMerchant.getOweBillBeforeDays()) { - bill.setOweBillLastTime(getDateAfter(wxMerchant.getOweBillBeforeDays())); + bill.setOweBillLastTime(getDateBefore(wxMerchant.getOweBillBeforeDays())); } if (null != wxMerchant.getNearBillBeforeDays()) { - bill.setNearBillLastTime(getDateAfter(wxMerchant.getNearBillBeforeDays())); + bill.setNearBillLastTime(getDateBefore(wxMerchant.getNearBillBeforeDays())); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 00dc2be12..8c02b711f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -82,8 +82,8 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD } private void updateQueryParam(WxBillDaily record) { - if (null != record.getFloorForRule()) { - List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); + if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); if (null != merchantIds) { record.setMerchantIds(merchantIds); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 12abdc8e0..fa042b57f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -98,8 +98,8 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil } private void setQueryParam(WxBillDeposit record) { - if (null != record.getFloorForRule()) { - List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); + if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); if (null != merchantIds) { record.setMerchantIds(merchantIds); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 455604b38..43c9f6d1e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -87,8 +87,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements } private void updateQueryParam(WxBillOtherDeposit record) { - if (null != record.getFloorForRule()) { - List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); + if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); if (null != merchantIds) { record.setMerchantIds(merchantIds); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 256f59df8..002ae82bc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -87,8 +87,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO } private void updateQueryParam(WxBillOther record) { - if (null != record.getFloorForRule()) { - List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); + if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); if (null != merchantIds) { record.setMerchantIds(merchantIds); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index 733caf673..b37f1d613 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -91,8 +91,8 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen } private void updateQueryParam(WxBillPropertyDeposit record) { - if (null != record.getFloorForRule()) { - List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); + if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); if (null != merchantIds) { record.setMerchantIds(merchantIds); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index b5606f6b7..7f681a83b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -85,8 +85,8 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W } private void updateQueryParam(WxBillRentManage wxBillRentManage) { - if (null != wxBillRentManage.getFloorForRule()) { - List merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRentManage, wxBillRentManage.getFloorForRule(), null, null, 0, 0); + if (null != wxBillRentManage.getFloorForRule() || null != wxBillRentManage.getFloor() || null != wxBillRentManage.getBuilding()) { + List merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRentManage, wxBillRentManage.getFloorForRule(), wxBillRentManage.getBuilding(), wxBillRentManage.getFloor(), 0, 0); if (null != merchantIds) { wxBillRentManage.setMerchantIds(merchantIds); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index c17c6d888..c093972d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1208,7 +1208,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { } } - List merchantIds = new ArrayList(); + List merchantIds = record.getIds(); + if (null == merchantIds) { + merchantIds = new ArrayList(); + } if (record.getCouponId() != null){ List couponMerchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(record.getCouponId(), record.getTenantId());