|
|
|
@@ -585,41 +585,41 @@ public class WxBillAllHelper { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
public List<WxBillNotify> getBillNotifyList(WxMerchant wxMerchant) { |
|
|
|
public List<WxBillNotify> getBillNotifyList(WxMerchant wxMerchant,Integer notifyed) { |
|
|
|
List<WxBillNotify> retList = new ArrayList<WxBillNotify>(); |
|
|
|
List<WxBillNotify> rentList = getBillNotifyList(EnumBillAllType.RENT,wxMerchant); |
|
|
|
List<WxBillNotify> rentList = getBillNotifyList(EnumBillAllType.RENT,wxMerchant,notifyed); |
|
|
|
if (null != rentList) { |
|
|
|
retList.addAll(rentList); |
|
|
|
} |
|
|
|
List<WxBillNotify> rentBussinessList = getBillNotifyList(EnumBillAllType.RENT_BUSSINESS_MANAGE,wxMerchant); |
|
|
|
List<WxBillNotify> rentBussinessList = getBillNotifyList(EnumBillAllType.RENT_BUSSINESS_MANAGE,wxMerchant,notifyed); |
|
|
|
if (null != rentBussinessList) { |
|
|
|
retList.addAll(rentBussinessList); |
|
|
|
} |
|
|
|
List<WxBillNotify> rentOperationList = getBillNotifyList(EnumBillAllType.RENT_OPERATION_MANAGE,wxMerchant); |
|
|
|
List<WxBillNotify> rentOperationList = getBillNotifyList(EnumBillAllType.RENT_OPERATION_MANAGE,wxMerchant,notifyed); |
|
|
|
if (null != rentOperationList) { |
|
|
|
retList.addAll(rentOperationList); |
|
|
|
} |
|
|
|
List<WxBillNotify> rentDepositList = getBillNotifyList(EnumBillAllType.RENT_DEPOSIT,wxMerchant); |
|
|
|
List<WxBillNotify> rentDepositList = getBillNotifyList(EnumBillAllType.RENT_DEPOSIT,wxMerchant,notifyed); |
|
|
|
if (null != rentDepositList) { |
|
|
|
retList.addAll(rentDepositList); |
|
|
|
} |
|
|
|
List<WxBillNotify> propertyList = getBillNotifyList(EnumBillAllType.PROPERTY,wxMerchant); |
|
|
|
List<WxBillNotify> propertyList = getBillNotifyList(EnumBillAllType.PROPERTY,wxMerchant,notifyed); |
|
|
|
if (null != propertyList) { |
|
|
|
retList.addAll(propertyList); |
|
|
|
} |
|
|
|
List<WxBillNotify> propertyDepositList = getBillNotifyList(EnumBillAllType.PROPERTY_DEPOSIT,wxMerchant); |
|
|
|
List<WxBillNotify> propertyDepositList = getBillNotifyList(EnumBillAllType.PROPERTY_DEPOSIT,wxMerchant,notifyed); |
|
|
|
if (null != propertyDepositList) { |
|
|
|
retList.addAll(propertyDepositList); |
|
|
|
} |
|
|
|
List<WxBillNotify> dailyList = getBillNotifyList(EnumBillAllType.DAILY,wxMerchant); |
|
|
|
List<WxBillNotify> dailyList = getBillNotifyList(EnumBillAllType.DAILY,wxMerchant,notifyed); |
|
|
|
if (null != dailyList) { |
|
|
|
retList.addAll(dailyList); |
|
|
|
} |
|
|
|
List<WxBillNotify> otherList = getBillNotifyList(EnumBillAllType.OTHER,wxMerchant); |
|
|
|
List<WxBillNotify> otherList = getBillNotifyList(EnumBillAllType.OTHER,wxMerchant,notifyed); |
|
|
|
if (null != otherList) { |
|
|
|
retList.addAll(otherList); |
|
|
|
} |
|
|
|
List<WxBillNotify> otherDepositList = getBillNotifyList(EnumBillAllType.OTHER_DEPOSIT,wxMerchant); |
|
|
|
List<WxBillNotify> otherDepositList = getBillNotifyList(EnumBillAllType.OTHER_DEPOSIT,wxMerchant,notifyed); |
|
|
|
if (null != otherDepositList) { |
|
|
|
retList.addAll(otherDepositList); |
|
|
|
} |
|
|
|
@@ -642,11 +642,11 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
return retList; |
|
|
|
} |
|
|
|
private List<WxBillNotify> getBillNotifyList(EnumBillAllType billType,WxMerchant wxMerchant) { |
|
|
|
private List<WxBillNotify> getBillNotifyList(EnumBillAllType billType,WxMerchant wxMerchant,Integer notifyed) { |
|
|
|
if (billType == EnumBillAllType.RENT) { |
|
|
|
WxBillRent wxBillRent = new WxBillRent(); |
|
|
|
updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillRent.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillRent.setNotifyed(notifyed); |
|
|
|
wxBillRent.setBillType(EnumBillAllType.RENT.getCode()); |
|
|
|
wxBillRent.setBillTypeName(EnumBillAllType.RENT.getMessage()); |
|
|
|
wxBillRent.setSortColumns("starttime asc"); |
|
|
|
@@ -655,7 +655,7 @@ public class WxBillAllHelper { |
|
|
|
WxBillRentManage wxBillRentManage = new WxBillRentManage(); |
|
|
|
wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); |
|
|
|
updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillRentManage.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillRentManage.setNotifyed(notifyed); |
|
|
|
wxBillRentManage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); |
|
|
|
wxBillRentManage.setBillTypeName(EnumBillAllType.RENT_BUSSINESS_MANAGE.getMessage()); |
|
|
|
wxBillRentManage.setSortColumns("starttime asc"); |
|
|
|
@@ -664,7 +664,7 @@ public class WxBillAllHelper { |
|
|
|
WxBillRentManage wxBillRentManage = new WxBillRentManage(); |
|
|
|
wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); |
|
|
|
updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillRentManage.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillRentManage.setNotifyed(notifyed); |
|
|
|
wxBillRentManage.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); |
|
|
|
wxBillRentManage.setBillTypeName(EnumBillAllType.RENT_OPERATION_MANAGE.getMessage()); |
|
|
|
wxBillRentManage.setSortColumns("starttime asc"); |
|
|
|
@@ -672,7 +672,7 @@ public class WxBillAllHelper { |
|
|
|
}else if (billType == EnumBillAllType.RENT_DEPOSIT) { |
|
|
|
WxBillDeposit wxBillDeposit = new WxBillDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillDeposit.setNotifyed(notifyed); |
|
|
|
wxBillDeposit.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); |
|
|
|
wxBillDeposit.setBillTypeName(EnumBillAllType.RENT_DEPOSIT.getMessage()); |
|
|
|
wxBillDeposit.setSortColumns("starttime asc"); |
|
|
|
@@ -680,7 +680,7 @@ public class WxBillAllHelper { |
|
|
|
}else if (billType == EnumBillAllType.PROPERTY) { |
|
|
|
WxBillProperty wxBillProperty = new WxBillProperty(); |
|
|
|
updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillProperty.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillProperty.setNotifyed(notifyed); |
|
|
|
wxBillProperty.setBillType(EnumBillAllType.PROPERTY.getCode()); |
|
|
|
wxBillProperty.setBillTypeName(EnumBillAllType.PROPERTY.getMessage()); |
|
|
|
wxBillProperty.setSortColumns("starttime asc"); |
|
|
|
@@ -688,7 +688,7 @@ public class WxBillAllHelper { |
|
|
|
}else if (billType == EnumBillAllType.PROPERTY_DEPOSIT) { |
|
|
|
WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillPropertyDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillPropertyDeposit.setNotifyed(notifyed); |
|
|
|
wxBillPropertyDeposit.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode()); |
|
|
|
wxBillPropertyDeposit.setBillTypeName(EnumBillAllType.PROPERTY_DEPOSIT.getMessage()); |
|
|
|
wxBillPropertyDeposit.setSortColumns("starttime asc"); |
|
|
|
@@ -696,7 +696,7 @@ public class WxBillAllHelper { |
|
|
|
}else if (billType == EnumBillAllType.DAILY) { |
|
|
|
WxBillDaily wxBillDaily = new WxBillDaily(); |
|
|
|
updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillDaily.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillDaily.setNotifyed(notifyed); |
|
|
|
wxBillDaily.setBillType(EnumBillAllType.DAILY.getCode()); |
|
|
|
wxBillDaily.setBillTypeName(EnumBillAllType.DAILY.getMessage()); |
|
|
|
wxBillDaily.setSortColumns("starttime asc"); |
|
|
|
@@ -704,7 +704,7 @@ public class WxBillAllHelper { |
|
|
|
}else if (billType == EnumBillAllType.OTHER) { |
|
|
|
WxBillOther wxBillOther = new WxBillOther(); |
|
|
|
updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillOther.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillOther.setNotifyed(notifyed); |
|
|
|
wxBillOther.setBillType(EnumBillAllType.OTHER.getCode()); |
|
|
|
wxBillOther.setBillTypeName(EnumBillAllType.OTHER.getMessage()); |
|
|
|
wxBillOther.setSortColumns("starttime asc"); |
|
|
|
@@ -712,7 +712,7 @@ public class WxBillAllHelper { |
|
|
|
}else if (billType == EnumBillAllType.OTHER_DEPOSIT) { |
|
|
|
WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillOtherDeposit.setNotifyed(EnumYesOrNo.YES.getCode()); |
|
|
|
wxBillOtherDeposit.setNotifyed(notifyed); |
|
|
|
wxBillOtherDeposit.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode()); |
|
|
|
wxBillOtherDeposit.setBillTypeName(EnumBillAllType.OTHER_DEPOSIT.getMessage()); |
|
|
|
wxBillOtherDeposit.setSortColumns("starttime asc"); |
|
|
|
|