| @@ -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<WxBillDaily> 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); | |||
| @@ -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())); | |||
| } | |||
| } | |||
| @@ -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); | |||
| @@ -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); | |||
| @@ -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); | |||
| @@ -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())); | |||
| } | |||
| } | |||
| @@ -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())); | |||
| } | |||
| } | |||
| @@ -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); | |||
| @@ -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())); | |||
| } | |||
| } | |||
| @@ -82,8 +82,8 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| } | |||
| private void updateQueryParam(WxBillDaily record) { | |||
| if (null != record.getFloorForRule()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); | |||
| if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); | |||
| if (null != merchantIds) { | |||
| record.setMerchantIds(merchantIds); | |||
| }else { | |||
| @@ -98,8 +98,8 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| } | |||
| private void setQueryParam(WxBillDeposit record) { | |||
| if (null != record.getFloorForRule()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); | |||
| if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); | |||
| if (null != merchantIds) { | |||
| record.setMerchantIds(merchantIds); | |||
| }else { | |||
| @@ -87,8 +87,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| } | |||
| private void updateQueryParam(WxBillOtherDeposit record) { | |||
| if (null != record.getFloorForRule()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); | |||
| if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); | |||
| if (null != merchantIds) { | |||
| record.setMerchantIds(merchantIds); | |||
| }else { | |||
| @@ -87,8 +87,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| } | |||
| private void updateQueryParam(WxBillOther record) { | |||
| if (null != record.getFloorForRule()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); | |||
| if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); | |||
| if (null != merchantIds) { | |||
| record.setMerchantIds(merchantIds); | |||
| }else { | |||
| @@ -91,8 +91,8 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| } | |||
| private void updateQueryParam(WxBillPropertyDeposit record) { | |||
| if (null != record.getFloorForRule()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); | |||
| if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0); | |||
| if (null != merchantIds) { | |||
| record.setMerchantIds(merchantIds); | |||
| }else { | |||
| @@ -85,8 +85,8 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| } | |||
| private void updateQueryParam(WxBillRentManage wxBillRentManage) { | |||
| if (null != wxBillRentManage.getFloorForRule()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRentManage, wxBillRentManage.getFloorForRule(), null, null, 0, 0); | |||
| if (null != wxBillRentManage.getFloorForRule() || null != wxBillRentManage.getFloor() || null != wxBillRentManage.getBuilding()) { | |||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRentManage, wxBillRentManage.getFloorForRule(), wxBillRentManage.getBuilding(), wxBillRentManage.getFloor(), 0, 0); | |||
| if (null != merchantIds) { | |||
| wxBillRentManage.setMerchantIds(merchantIds); | |||
| }else { | |||
| @@ -1208,7 +1208,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||
| } | |||
| } | |||
| List<Long> merchantIds = new ArrayList<Long>(); | |||
| List<Long> merchantIds = record.getIds(); | |||
| if (null == merchantIds) { | |||
| merchantIds = new ArrayList<Long>(); | |||
| } | |||
| if (record.getCouponId() != null){ | |||
| List<Long> couponMerchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(record.getCouponId(), record.getTenantId()); | |||