|
|
|
@@ -759,47 +759,47 @@ public class WxBillAllHelper { |
|
|
|
public List<WxBillHotNotify> getHotNotify(WxMerchant wxMerchant) { |
|
|
|
List<WxBillHotNotify> retList = new ArrayList<WxBillHotNotify>(); |
|
|
|
WxBillHotNotify rentNotify = this.getBillRentHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime()); |
|
|
|
if (null != rentNotify) { |
|
|
|
if (null != rentNotify && rentNotify.getTotalCount() > 0 ) { |
|
|
|
retList.add(rentNotify); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillHotNotify rentBussinessManageNotify = this.getBillRentManageHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime(),EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); |
|
|
|
if (null != rentBussinessManageNotify) { |
|
|
|
if (null != rentBussinessManageNotify && rentBussinessManageNotify.getTotalCount() > 0 ){ |
|
|
|
retList.add(rentBussinessManageNotify); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillHotNotify rentOperationManageNotify = this.getBillRentManageHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime(),EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE); |
|
|
|
if (null != rentOperationManageNotify) { |
|
|
|
if (null != rentOperationManageNotify && rentOperationManageNotify.getTotalCount() > 0 ) { |
|
|
|
retList.add(rentOperationManageNotify); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillHotNotify rentDepositNotify = this.getBillDepositHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime()); |
|
|
|
if (null != rentDepositNotify) { |
|
|
|
if (null != rentDepositNotify && rentDepositNotify.getTotalCount() > 0 ) { |
|
|
|
retList.add(rentDepositNotify); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillHotNotify propertyNotify = this.getBillPropertyHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime()); |
|
|
|
if (null != propertyNotify) { |
|
|
|
if (null != propertyNotify && propertyNotify.getTotalCount() > 0 ) { |
|
|
|
retList.add(propertyNotify); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillHotNotify propertyDepositNotify = this.getBillPropertyDepositHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime()); |
|
|
|
if (null != propertyDepositNotify) { |
|
|
|
if (null != propertyDepositNotify && propertyDepositNotify.getTotalCount() > 0 ) { |
|
|
|
retList.add(propertyDepositNotify); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillHotNotify dailyNotify = this.getBillDailyHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime()); |
|
|
|
if (null != dailyNotify) { |
|
|
|
if (null != dailyNotify && dailyNotify.getTotalCount() > 0 ) { |
|
|
|
retList.add(dailyNotify); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillHotNotify otherNotify = this.getBillOtherHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime()); |
|
|
|
if (null != otherNotify) { |
|
|
|
if (null != otherNotify && otherNotify.getTotalCount() > 0 ) { |
|
|
|
retList.add(otherNotify); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillHotNotify otherDepositNotify = this.getBillOtherDepositHotNotify(wxMerchant, wxMerchant.getStarttime(), wxMerchant.getEndtime()); |
|
|
|
if (null != otherDepositNotify) { |
|
|
|
if (null != otherDepositNotify && otherDepositNotify.getTotalCount() > 0 ) { |
|
|
|
retList.add(otherDepositNotify); |
|
|
|
} |
|
|
|
return retList; |
|
|
|
|