winter 1 год назад
Родитель
Сommit
ab41b8fc76
1 измененных файлов: 9 добавлений и 9 удалений
  1. +9
    -9
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java

+ 9
- 9
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Просмотреть файл

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


Загрузка…
Отмена
Сохранить