|
|
|
@@ -23,6 +23,7 @@ import com.iformall.domain.po.WxBillRent; |
|
|
|
import com.iformall.domain.po.WxBillRentManage; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.po.base.WxBillBaseEntity; |
|
|
|
import com.iformall.domain.vo.WxBillSum; |
|
|
|
import com.iformall.domain.vo.WxShopVo; |
|
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
|
@@ -70,13 +71,24 @@ public class WxBillAllHelper { |
|
|
|
@Autowired |
|
|
|
private WxShopService wxShopService; |
|
|
|
|
|
|
|
|
|
|
|
private void updateQueryParm(WxMerchant wxMerchant,WxBillBaseEntity bill,Date starttime,Date enttime) { |
|
|
|
bill.updateTenantInfo(wxMerchant); |
|
|
|
bill.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
bill.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
bill.setBuilding(wxMerchant.getBuilding()); |
|
|
|
bill.setFloor(wxMerchant.getFloor()); |
|
|
|
bill.setMerchantName(wxMerchant.getName()); |
|
|
|
bill.setMerchantId(wxMerchant.getId()); |
|
|
|
bill.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bill.setStarttime(starttime); |
|
|
|
bill.setEndtime(enttime); |
|
|
|
bill.setRentShopType(wxMerchant.getType()); |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillRentSum(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillRent br = new WxBillRent(); |
|
|
|
br.updateTenantInfo(wxMerchant); |
|
|
|
br.setStarttime(starttime); |
|
|
|
br.setEndtime(enttime); |
|
|
|
br.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
br.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, br,starttime,enttime); |
|
|
|
WxBillSum rentSum = wxBillRentService.getBillMonthSum(br); |
|
|
|
if (null == rentSum) { |
|
|
|
rentSum = new WxBillSum(); |
|
|
|
@@ -87,24 +99,16 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getBillRentMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillRent br = new WxBillRent(); |
|
|
|
br.updateTenantInfo(wxMerchant); |
|
|
|
br.setStarttime(starttime); |
|
|
|
br.setEndtime(enttime); |
|
|
|
br.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
br.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, br,starttime,enttime); |
|
|
|
return wxBillRentService.getMerchantIds(br); |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillRentManage(WxMerchant wxMerchant,Date starttime, Date enttime,EnumRentContractManageFeeType manageFeeType) { |
|
|
|
public WxBillSum getBillRentManageSum(WxMerchant wxMerchant,Date starttime, Date enttime,EnumRentContractManageFeeType manageFeeType) { |
|
|
|
WxBillRentManage brm = new WxBillRentManage(); |
|
|
|
brm.updateTenantInfo(wxMerchant); |
|
|
|
brm.setStarttime(starttime); |
|
|
|
brm.setEndtime(enttime); |
|
|
|
brm.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
if (null != manageFeeType) { |
|
|
|
brm.setManageFeeType(manageFeeType.getCode()); |
|
|
|
} |
|
|
|
brm.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, brm,starttime,enttime); |
|
|
|
WxBillSum rentManageSum = wxBillRentManageService.getBillMonthSum(brm); |
|
|
|
if (null == rentManageSum) { |
|
|
|
rentManageSum = new WxBillSum(); |
|
|
|
@@ -119,24 +123,16 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getBillRentManageMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime,EnumRentContractManageFeeType manageFeeType) { |
|
|
|
WxBillRentManage brm = new WxBillRentManage(); |
|
|
|
brm.updateTenantInfo(wxMerchant); |
|
|
|
brm.setStarttime(starttime); |
|
|
|
brm.setEndtime(enttime); |
|
|
|
brm.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
if (null != manageFeeType) { |
|
|
|
brm.setManageFeeType(manageFeeType.getCode()); |
|
|
|
} |
|
|
|
brm.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, brm,starttime,enttime); |
|
|
|
return wxBillRentManageService.getMerchantIds(brm); |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillDeposit(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
public WxBillSum getBillDepositSum(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillDeposit bd = new WxBillDeposit(); |
|
|
|
bd.updateTenantInfo(wxMerchant); |
|
|
|
bd.setStarttime(starttime); |
|
|
|
bd.setEndtime(enttime); |
|
|
|
bd.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bd.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, bd,starttime,enttime); |
|
|
|
WxBillSum rentDepositSum = wxBillRentDepositService.getBillMonthSum(bd); |
|
|
|
if (null == rentDepositSum) { |
|
|
|
rentDepositSum = new WxBillSum(); |
|
|
|
@@ -147,21 +143,13 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getBillDepositMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillDeposit bd = new WxBillDeposit(); |
|
|
|
bd.updateTenantInfo(wxMerchant); |
|
|
|
bd.setStarttime(starttime); |
|
|
|
bd.setEndtime(enttime); |
|
|
|
bd.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bd.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, bd,starttime,enttime); |
|
|
|
return wxBillRentDepositService.getMerchantIds(bd); |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillProperty(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
public WxBillSum getBillPropertySum(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillProperty bp = new WxBillProperty(); |
|
|
|
bp.updateTenantInfo(wxMerchant); |
|
|
|
bp.setStarttime(starttime); |
|
|
|
bp.setEndtime(enttime); |
|
|
|
bp.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bp.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, bp,starttime,enttime); |
|
|
|
WxBillSum propertySum = wxBillPropertyService.getBillMonthSum(bp); |
|
|
|
if (null == propertySum) { |
|
|
|
propertySum = new WxBillSum(); |
|
|
|
@@ -172,21 +160,13 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getBillPropertyMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillProperty bp = new WxBillProperty(); |
|
|
|
bp.updateTenantInfo(wxMerchant); |
|
|
|
bp.setStarttime(starttime); |
|
|
|
bp.setEndtime(enttime); |
|
|
|
bp.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bp.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, bp,starttime,enttime); |
|
|
|
return wxBillPropertyService.getMerchantIds(bp); |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillPropertyDeposit(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
public WxBillSum getBillPropertyDepositSum(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillPropertyDeposit pd = new WxBillPropertyDeposit(); |
|
|
|
pd.updateTenantInfo(wxMerchant); |
|
|
|
pd.setStarttime(starttime); |
|
|
|
pd.setEndtime(enttime); |
|
|
|
pd.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
pd.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, pd,starttime,enttime); |
|
|
|
WxBillSum propertyDepositSum = wxBillPropertyDepositService.getBillMonthSum(pd); |
|
|
|
if (null == propertyDepositSum) { |
|
|
|
propertyDepositSum = new WxBillSum(); |
|
|
|
@@ -197,24 +177,16 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getBillPropertyDepositMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillPropertyDeposit pd = new WxBillPropertyDeposit(); |
|
|
|
pd.updateTenantInfo(wxMerchant); |
|
|
|
pd.setStarttime(starttime); |
|
|
|
pd.setEndtime(enttime); |
|
|
|
pd.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
pd.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, pd,starttime,enttime); |
|
|
|
return wxBillPropertyDepositService.getMerchantIds(pd); |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillDaily(WxMerchant wxMerchant,Date starttime, Date enttime,EnumBillDailyType dailyType) { |
|
|
|
public WxBillSum getBillDailySum(WxMerchant wxMerchant,Date starttime, Date enttime,EnumBillDailyType dailyType) { |
|
|
|
WxBillDaily bdd = new WxBillDaily(); |
|
|
|
bdd.updateTenantInfo(wxMerchant); |
|
|
|
bdd.setStarttime(starttime); |
|
|
|
bdd.setEndtime(enttime); |
|
|
|
bdd.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bdd.setMerchantId(wxMerchant.getId()); |
|
|
|
if (null != dailyType) { |
|
|
|
bdd.setType(dailyType.getCode()); |
|
|
|
} |
|
|
|
updateQueryParm(wxMerchant, bdd,starttime,enttime); |
|
|
|
WxBillSum dailySum = wxBillDailyService.getBillMonthSum(bdd); |
|
|
|
if (null == dailySum) { |
|
|
|
dailySum = new WxBillSum(); |
|
|
|
@@ -229,24 +201,16 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getBillDailyMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime,EnumBillDailyType dailyType) { |
|
|
|
WxBillDaily bdd = new WxBillDaily(); |
|
|
|
bdd.updateTenantInfo(wxMerchant); |
|
|
|
bdd.setStarttime(starttime); |
|
|
|
bdd.setEndtime(enttime); |
|
|
|
bdd.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bdd.setMerchantId(wxMerchant.getId()); |
|
|
|
if (null != dailyType) { |
|
|
|
bdd.setType(dailyType.getCode()); |
|
|
|
} |
|
|
|
updateQueryParm(wxMerchant, bdd,starttime,enttime); |
|
|
|
return wxBillDailyService.getMerchantIds(bdd); |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillOther(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
public WxBillSum getBillOtherSum(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillOther bo = new WxBillOther(); |
|
|
|
bo.updateTenantInfo(wxMerchant); |
|
|
|
bo.setStarttime(starttime); |
|
|
|
bo.setEndtime(enttime); |
|
|
|
bo.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bo.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, bo,starttime,enttime); |
|
|
|
WxBillSum otherSum = wxBillOtherService.getBillMonthSum(bo); |
|
|
|
if (null == otherSum) { |
|
|
|
otherSum = new WxBillSum(); |
|
|
|
@@ -257,21 +221,13 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getBillOtherMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillOther bo = new WxBillOther(); |
|
|
|
bo.updateTenantInfo(wxMerchant); |
|
|
|
bo.setStarttime(starttime); |
|
|
|
bo.setEndtime(enttime); |
|
|
|
bo.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bo.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, bo,starttime,enttime); |
|
|
|
return wxBillOtherService.getMerchantIds(bo); |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillOtherDeposit(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
public WxBillSum getBillOtherDepositSum(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillOtherDeposit bod = new WxBillOtherDeposit(); |
|
|
|
bod.updateTenantInfo(wxMerchant); |
|
|
|
bod.setStarttime(starttime); |
|
|
|
bod.setEndtime(enttime); |
|
|
|
bod.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bod.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, bod,starttime,enttime); |
|
|
|
WxBillSum otherDepositSum = wxBillOtherDepositService.getBillMonthSum(bod); |
|
|
|
if (null == otherDepositSum) { |
|
|
|
otherDepositSum = new WxBillSum(); |
|
|
|
@@ -282,11 +238,7 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getBillOtherDepositMerchantIds(WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
WxBillOtherDeposit bod = new WxBillOtherDeposit(); |
|
|
|
bod.updateTenantInfo(wxMerchant); |
|
|
|
bod.setStarttime(starttime); |
|
|
|
bod.setEndtime(enttime); |
|
|
|
bod.setOnlyOwe(wxMerchant.getOnlyOwe()); |
|
|
|
bod.setMerchantId(wxMerchant.getId()); |
|
|
|
updateQueryParm(wxMerchant, bod,starttime,enttime); |
|
|
|
return wxBillOtherDepositService.getMerchantIds(bod); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -348,124 +300,66 @@ public class WxBillAllHelper { |
|
|
|
public PageInfo getBillList(EnumBillAllType billType,WxMerchant wxMerchant,Integer pageNum, Integer pageSize) { |
|
|
|
if (billType == EnumBillAllType.RENT) { |
|
|
|
WxBillRent wxBillRent = new WxBillRent(); |
|
|
|
wxBillRent.updateTenantInfo(wxMerchant); |
|
|
|
wxBillRent.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillRent.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillRent.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillRent.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillRent.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillRent.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillRent.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillRent.setMerchantName(wxMerchant.getName());; |
|
|
|
updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); |
|
|
|
}else if (billType == EnumBillAllType.RENT_BUSSINESS_MANAGE) { |
|
|
|
WxBillRentManage wxBillRentManage = new WxBillRentManage(); |
|
|
|
wxBillRentManage.updateTenantInfo(wxMerchant); |
|
|
|
wxBillRentManage.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillRentManage.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillRentManage.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillRentManage.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillRentManage.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillRentManage.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillRentManage.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillRentManage.setMerchantName(wxMerchant.getName()); |
|
|
|
wxBillRentManage.setManageFeeType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); |
|
|
|
wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); |
|
|
|
updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); |
|
|
|
}else if (billType == EnumBillAllType.RENT_OPERATION_MANAGE) { |
|
|
|
WxBillRentManage wxBillRentManage = new WxBillRentManage(); |
|
|
|
wxBillRentManage.updateTenantInfo(wxMerchant); |
|
|
|
wxBillRentManage.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillRentManage.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillRentManage.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillRentManage.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillRentManage.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillRentManage.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillRentManage.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillRentManage.setMerchantName(wxMerchant.getName()); |
|
|
|
wxBillRentManage.setManageFeeType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode()); |
|
|
|
wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); |
|
|
|
updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); |
|
|
|
}else if (billType == EnumBillAllType.RENT_DEPOSIT) { |
|
|
|
WxBillDeposit wxBillDeposit = new WxBillDeposit(); |
|
|
|
wxBillDeposit.updateTenantInfo(wxMerchant); |
|
|
|
wxBillDeposit.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillDeposit.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillDeposit.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillDeposit.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillDeposit.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillDeposit.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillDeposit.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillDeposit.setMerchantName(wxMerchant.getName()); |
|
|
|
updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillRentDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); |
|
|
|
}else if (billType == EnumBillAllType.PROPERTY) { |
|
|
|
WxBillProperty wxBillProperty = new WxBillProperty(); |
|
|
|
wxBillProperty.updateTenantInfo(wxMerchant); |
|
|
|
wxBillProperty.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillProperty.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillProperty.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillProperty.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillProperty.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillProperty.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillProperty.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillProperty.setMerchantName(wxMerchant.getName()); |
|
|
|
updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); |
|
|
|
}else if (billType == EnumBillAllType.PROPERTY_DEPOSIT) { |
|
|
|
WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); |
|
|
|
wxBillPropertyDeposit.updateTenantInfo(wxMerchant); |
|
|
|
wxBillPropertyDeposit.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillPropertyDeposit.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillPropertyDeposit.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillPropertyDeposit.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillPropertyDeposit.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillPropertyDeposit.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillPropertyDeposit.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillPropertyDeposit.setMerchantName(wxMerchant.getName()); |
|
|
|
updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); |
|
|
|
}else if (billType == EnumBillAllType.DAILY) { |
|
|
|
WxBillDaily wxBillDaily = new WxBillDaily(); |
|
|
|
wxBillDaily.updateTenantInfo(wxMerchant); |
|
|
|
wxBillDaily.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillDaily.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillDaily.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillDaily.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillDaily.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillDaily.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillDaily.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillDaily.setMerchantName(wxMerchant.getName()); |
|
|
|
updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); |
|
|
|
}else if (billType == EnumBillAllType.OTHER) { |
|
|
|
WxBillOther wxBillOther = new WxBillOther(); |
|
|
|
wxBillOther.updateTenantInfo(wxMerchant); |
|
|
|
wxBillOther.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillOther.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillOther.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillOther.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillOther.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillOther.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillOther.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillOther.setMerchantName(wxMerchant.getName()); |
|
|
|
updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); |
|
|
|
}else if (billType == EnumBillAllType.OTHER_DEPOSIT) { |
|
|
|
WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); |
|
|
|
wxBillOtherDeposit.updateTenantInfo(wxMerchant); |
|
|
|
wxBillOtherDeposit.setFloorForRule(wxMerchant.getFloorForRule()); |
|
|
|
wxBillOtherDeposit.setBusinessForRule(wxMerchant.getBusinessForRule()); |
|
|
|
wxBillOtherDeposit.setBuilding(wxMerchant.getBuilding()); |
|
|
|
wxBillOtherDeposit.setFloor(wxMerchant.getFloor()); |
|
|
|
|
|
|
|
wxBillOtherDeposit.setStarttime(wxMerchant.getStarttime()); |
|
|
|
wxBillOtherDeposit.setEndtime(wxMerchant.getEndtime()); |
|
|
|
wxBillOtherDeposit.setRentShopType(wxMerchant.getType()); |
|
|
|
wxBillOtherDeposit.setMerchantName(wxMerchant.getName()); |
|
|
|
updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
return wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
public WxBillSum getBillSum(EnumBillAllType billType,WxMerchant wxMerchant,Date starttime, Date enttime) { |
|
|
|
if (billType == EnumBillAllType.RENT) { |
|
|
|
return this.getBillRentSum(wxMerchant, starttime, enttime); |
|
|
|
}else if (billType == EnumBillAllType.RENT_BUSSINESS_MANAGE) { |
|
|
|
return this.getBillRentManageSum(wxMerchant, starttime, enttime, EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); |
|
|
|
}else if (billType == EnumBillAllType.RENT_OPERATION_MANAGE) { |
|
|
|
return this.getBillRentManageSum(wxMerchant, starttime, enttime, EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); |
|
|
|
}else if (billType == EnumBillAllType.RENT_DEPOSIT) { |
|
|
|
return this.getBillDepositSum(wxMerchant, starttime, enttime); |
|
|
|
}else if (billType == EnumBillAllType.PROPERTY) { |
|
|
|
return this.getBillPropertySum(wxMerchant, starttime, enttime); |
|
|
|
}else if (billType == EnumBillAllType.PROPERTY_DEPOSIT) { |
|
|
|
return this.getBillPropertyDepositSum(wxMerchant, starttime, enttime); |
|
|
|
}else if (billType == EnumBillAllType.DAILY) { |
|
|
|
return this.getBillDailySum(wxMerchant, starttime, enttime, null); |
|
|
|
}else if (billType == EnumBillAllType.OTHER) { |
|
|
|
return this.getBillOtherSum(wxMerchant, starttime, enttime); |
|
|
|
}else if (billType == EnumBillAllType.OTHER_DEPOSIT) { |
|
|
|
return this.getBillOtherDepositSum(wxMerchant, starttime, enttime); |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |