diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java index 26854e3f7..3696384d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java @@ -35,6 +35,7 @@ public interface WxBillDailyService { * @return */ PageInfo listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize); + List list(WxBillDaily record); List notifyList(WxBillDaily record); void updateBillStatus(WxBillDaily record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java index 0e4e05366..8b1cefe0d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -34,6 +34,7 @@ public interface WxBillDepositService { * @return */ PageInfo listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize); + List list(WxBillDeposit record); List notifyList(WxBillDeposit record); void updateBillStatus(WxBillDeposit record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java index 73ec3e0df..36f358a05 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -34,6 +34,7 @@ public interface WxBillOtherDepositService { * @return */ PageInfo listAsPage(WxBillOtherDeposit record, Integer pageIndex, Integer pageSize); + List list(WxBillOtherDeposit record); List notifyList(WxBillOtherDeposit record); void updateBillStatus(WxBillOtherDeposit record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java index 6dfe7a8e5..81cc068a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java @@ -34,6 +34,7 @@ public interface WxBillOtherService { * @return */ PageInfo listAsPage(WxBillOther record, Integer pageIndex, Integer pageSize); + List list(WxBillOther record); List notifyList(WxBillOther record); void updateBillStatus(WxBillOther record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java index eebbc2d0f..09cee35cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -37,6 +37,7 @@ public interface WxBillPropertyDepositService { * @return */ PageInfo listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize); + List list(WxBillPropertyDeposit record); List notifyList(WxBillPropertyDeposit record); void updateBillStatus(WxBillPropertyDeposit record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 8273d7a5d..c8ac9d4d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -37,6 +37,7 @@ public interface WxBillPropertyService { * @return */ PageInfo listAsPage(WxBillProperty record, Integer pageIndex, Integer pageSize); + List list(WxBillProperty record); List notifyList(WxBillProperty record); void updateBillStatus(WxBillProperty record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java index 10bb8d82f..6fce5281c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java @@ -34,6 +34,7 @@ public interface WxBillRentManageService { * @return */ PageInfo listAsPage(WxBillRentManage wxBillRentManage, Integer pageIndex, Integer pageSize); + List list(WxBillRentManage wxBillRentManage); List notifyList(WxBillRentManage wxBillRentManage); void updateBillStatus(WxBillRentManage record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index ea7188244..78dc78c9e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -34,6 +34,7 @@ public interface WxBillRentService { * @return */ PageInfo listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize); + List list(WxBillRent record); List notifyList(WxBillRent record); void updateBillStatus(WxBillRent record); 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 5942b6cd7..7a3ebc6a0 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -581,65 +581,65 @@ public class WxBillAllHelper { WxBillRent wxBillRent = new WxBillRent(); updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillRent.setSortColumns("starttime asc"); - PageInfo rentpage = wxBillRentService.listAsPage(wxBillRent, 1, 30); - if (null != rentpage && null != rentpage.getList() && rentpage.getList().size() > 0 ) { - retList.addAll(rentpage.getList()); + List rentpage = wxBillRentService.list(wxBillRent); + if (null != rentpage && rentpage.size() > 0 ) { + retList.addAll(rentpage); } WxBillRentManage wxBillRentManage = new WxBillRentManage(); updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillRentManage.setSortColumns("starttime asc"); - PageInfo managepage = wxBillRentManageService.listAsPage(wxBillRentManage, 1, 30); - if (null != managepage && null != managepage.getList() && managepage.getList().size() > 0 ) { - retList.addAll(managepage.getList()); + List managepage = wxBillRentManageService.list(wxBillRentManage); + if (null != managepage && managepage.size() > 0 ) { + retList.addAll(managepage); } WxBillDeposit wxBillDeposit = new WxBillDeposit(); updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillDeposit.setSortColumns("starttime asc"); - PageInfo rentdepostpage = wxBillRentDepositService.listAsPage(wxBillDeposit, 1, 30); - if (null != rentdepostpage && null != rentdepostpage.getList() && rentdepostpage.getList().size() > 0 ) { - retList.addAll(rentdepostpage.getList()); + List rentdepostpage = wxBillRentDepositService.list(wxBillDeposit); + if (null != rentdepostpage && rentdepostpage.size() > 0 ) { + retList.addAll(rentdepostpage); } WxBillProperty wxBillProperty = new WxBillProperty(); updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillProperty.setSortColumns("starttime asc"); - PageInfo propertypage = wxBillPropertyService.listAsPage(wxBillProperty, 1, 30); - if (null != propertypage && null != propertypage.getList() && propertypage.getList().size() > 0 ) { - retList.addAll(propertypage.getList()); + List propertypage = wxBillPropertyService.list(wxBillProperty); + if (null != propertypage && propertypage.size() > 0 ) { + retList.addAll(propertypage); } WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillPropertyDeposit.setSortColumns("starttime asc"); - PageInfo propertyDepositpage = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, 1, 30); - if (null != propertyDepositpage && null != propertyDepositpage.getList() && propertyDepositpage.getList().size() > 0 ) { - retList.addAll(propertyDepositpage.getList()); + List propertyDepositpage = wxBillPropertyDepositService.list(wxBillPropertyDeposit); + if (null != propertyDepositpage && propertyDepositpage.size() > 0 ) { + retList.addAll(propertyDepositpage); } WxBillDaily wxBillDaily = new WxBillDaily(); updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillDaily.setSortColumns("starttime asc"); - PageInfo dailypage = wxBillDailyService.listAsPage(wxBillDaily, 1, 30); - if (null != dailypage && null != dailypage.getList() && dailypage.getList().size() > 0 ) { - retList.addAll(dailypage.getList()); + List dailypage = wxBillDailyService.list(wxBillDaily); + if (null != dailypage && dailypage.size() > 0 ) { + retList.addAll(dailypage); } WxBillOther wxBillOther = new WxBillOther(); updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillOther.setSortColumns("starttime asc"); - PageInfo otherpage = wxBillOtherService.listAsPage(wxBillOther, 1, 30); - if (null != otherpage && null != otherpage.getList() && otherpage.getList().size() > 0 ) { - retList.addAll(otherpage.getList()); + List otherpage = wxBillOtherService.list(wxBillOther); + if (null != otherpage && otherpage.size() > 0 ) { + retList.addAll(otherpage); } WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillOtherDeposit.setSortColumns("starttime asc"); - PageInfo odpage = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, 1, 30); - if (null != odpage && null != odpage.getList() && odpage.getList().size() > 0 ) { - retList.addAll(odpage.getList()); + List odpage = wxBillOtherDepositService.list(wxBillOtherDeposit); + if (null != odpage && odpage.size() > 0 ) { + retList.addAll(odpage); } return retList; } 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 f86dc7a41..0ea2fe0d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -104,6 +104,12 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD return getBillRentPropertyList(pageIndex, pageSize, record, wxPayAccountBill); } + @Override + public List list(WxBillDaily record) { + updateQueryParam(record); + return wxBillDailyMapper.queryBillDailyList(record); + } + @Override public List notifyList(WxBillDaily record) { updateQueryParam(record); 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 bf9845689..5565e2962 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -109,6 +109,12 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil return getBillDepositPropertyList(wxPayAccountBill, record, pageIndex, pageSize); } + @Override + public List list(WxBillDeposit record) { + setQueryParam(record); + return wxBillDepositMapper.queryBillDepositList(record); + } + @Override public List notifyList(WxBillDeposit record) { setQueryParam(record); 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 9250695ae..a4f22b09f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -98,6 +98,12 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements return getBillRentPropertyList(pageIndex, pageSize, record, wxPayAccountBill); } + @Override + public List list(WxBillOtherDeposit record) { + updateQueryParam(record); + return wxBillOtherDepositMapper.queryBillList(record); + } + @Override public List notifyList(WxBillOtherDeposit record) { updateQueryParam(record); 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 415efde08..bec9bbf7d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -97,6 +97,12 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO return getBillOtherPropertyList(pageIndex, pageSize, record, wxPayAccountBill); } + @Override + public List list(WxBillOther record) { + updateQueryParam(record); + return wxBillOtherMapper.queryBillList(record); + } + @Override public List notifyList(WxBillOther record) { updateQueryParam(record); 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 0a4a0b247..f63566a52 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -103,6 +103,12 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen return getBillDepositPropertyList(wxPayAccountBill, record, pageIndex, pageSize); } + @Override + public List list(WxBillPropertyDeposit record) { + updateQueryParam(record); + return wxBillPropertyDepositMapper.queryBillDepositList(record); + } + @Override public List notifyList(WxBillPropertyDeposit record) { updateQueryParam(record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index e606bc983..eb7b405ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -119,6 +119,12 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi return getBillPropertyList(pageIndex, pageSize, wxPayAccountBill, record); } + @Override + public List list(WxBillProperty record) { + updateQueryParam(record); + return wxBillPropertyMapper.queryBillPropertyList(record); + } + @Override public List notifyList(WxBillProperty record) { updateQueryParam(record); 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 76a9ce1ca..0e6d436b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -104,6 +104,12 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W return getBillRentManageList(pageIndex, pageSize, wxBillRentManage, wxPayAccountBill); } + @Override + public List list(WxBillRentManage wxBillRentManage) { + updateQueryParam(wxBillRentManage); + return wxBillRentManageMapper.queryBillManageList(wxBillRentManage); + } + @Override public List notifyList(WxBillRentManage record) { updateQueryParam(record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 6c60c3b2d..b95882a50 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -123,6 +123,12 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe return getBillRentPropertyList(pageIndex,pageSize,record,wxPayAccountBill); } + @Override + public List list(WxBillRent record) { + updateQueryParam(record); + return wxBillRentMapper.queryBillRentList(record); + } + @Override public List notifyList(WxBillRent record) { updateQueryParam(record);