|
|
|
@@ -129,6 +129,10 @@ public class WxBillAllHelper { |
|
|
|
bill.setNearBillLastTime(getDateBefore(wxMerchant.getNearBillBeforeDays())); |
|
|
|
} |
|
|
|
bill.setStatus(wxMerchant.getBillStatus()); |
|
|
|
if (null != wxMerchant.getNeedPayPreDays()) { |
|
|
|
bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays())); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillRentSum(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
@@ -561,6 +565,75 @@ public class WxBillAllHelper { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
public List<WxBillBaseEntity> getMerchantBillList(WxMerchant wxMerchant) { |
|
|
|
List<WxBillBaseEntity> retList = new ArrayList<WxBillBaseEntity>(); |
|
|
|
|
|
|
|
WxBillRent wxBillRent = new WxBillRent(); |
|
|
|
updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillRent.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillRent> rentpage = wxBillRentService.listAsPage(wxBillRent, 1, 30); |
|
|
|
if (null != rentpage && null != rentpage.getList() && rentpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(rentpage.getList()); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillRentManage wxBillRentManage = new WxBillRentManage(); |
|
|
|
updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillRentManage.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillRentManage> managepage = wxBillRentManageService.listAsPage(wxBillRentManage, 1, 30); |
|
|
|
if (null != managepage && null != managepage.getList() && managepage.getList().size() > 0 ) { |
|
|
|
retList.addAll(managepage.getList()); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillDeposit wxBillDeposit = new WxBillDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillDeposit.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillDeposit> rentdepostpage = wxBillRentDepositService.listAsPage(wxBillDeposit, 1, 30); |
|
|
|
if (null != rentdepostpage && null != rentdepostpage.getList() && rentdepostpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(rentdepostpage.getList()); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillProperty wxBillProperty = new WxBillProperty(); |
|
|
|
updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillProperty.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillProperty> propertypage = wxBillPropertyService.listAsPage(wxBillProperty, 1, 30); |
|
|
|
if (null != propertypage && null != propertypage.getList() && propertypage.getList().size() > 0 ) { |
|
|
|
retList.addAll(propertypage.getList()); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillPropertyDeposit.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillPropertyDeposit> propertyDepositpage = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, 1, 30); |
|
|
|
if (null != propertyDepositpage && null != propertyDepositpage.getList() && propertyDepositpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(propertyDepositpage.getList()); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillDaily wxBillDaily = new WxBillDaily(); |
|
|
|
updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillDaily.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillDaily> dailypage = wxBillDailyService.listAsPage(wxBillDaily, 1, 30); |
|
|
|
if (null != dailypage && null != dailypage.getList() && dailypage.getList().size() > 0 ) { |
|
|
|
retList.addAll(dailypage.getList()); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillOther wxBillOther = new WxBillOther(); |
|
|
|
updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillOther.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillOther> otherpage = wxBillOtherService.listAsPage(wxBillOther, 1, 30); |
|
|
|
if (null != otherpage && null != otherpage.getList() && otherpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(otherpage.getList()); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillOtherDeposit.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillOtherDeposit> odpage = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, 1, 30); |
|
|
|
if (null != odpage && null != odpage.getList() && odpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(odpage.getList()); |
|
|
|
} |
|
|
|
return retList; |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillSum(EnumBillAllType billType,WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
if (billType == EnumBillAllType.RENT) { |
|
|
|
return this.getBillRentSum(wxMerchant, starttime, enttime); |
|
|
|
|