|
|
|
@@ -121,6 +121,7 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public WxBillSum getBillSum(WxShop wxShop,Date starttime, Date enttime) { |
|
|
|
WxAllBill br = new WxAllBill(); |
|
|
|
br.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
updateQueryParm(wxShop, br,starttime,enttime); |
|
|
|
WxBillSum rentSum = wxAllBillService.getBillMonthSum(br); |
|
|
|
if (null == rentSum) { |
|
|
|
@@ -131,12 +132,14 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<WxBillSum> getFeesBillSum(WxShop wxShop,Date starttime, Date enttime) { |
|
|
|
WxAllBill br = new WxAllBill(); |
|
|
|
br.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
updateQueryParm(wxShop, br,starttime,enttime); |
|
|
|
return wxAllBillService.getFeesBillSum(br); |
|
|
|
} |
|
|
|
|
|
|
|
public List<WxBillHotNotify> getBillHotNotify(WxShop wxShop,Date starttime, Date enttime) { |
|
|
|
WxAllBill br = new WxAllBill(); |
|
|
|
br.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
updateQueryParm(wxShop, br,starttime,enttime); |
|
|
|
br.setIsPreview(EnumYesOrNo.NO.getCode()); |
|
|
|
return wxAllBillService.getBillHotNotify(br); |
|
|
|
@@ -200,6 +203,7 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<Long> getOwdShopIds(WxShop wxShop,Date starttime, Date enttime) { |
|
|
|
WxAllBill br = new WxAllBill(); |
|
|
|
br.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
updateQueryParm(wxShop, br,starttime,enttime); |
|
|
|
return wxAllBillService.getShopIds(br); |
|
|
|
} |
|
|
|
@@ -209,6 +213,7 @@ public class WxBillAllHelper { |
|
|
|
bq.updateTenantInfo(tenantEntity); |
|
|
|
bq.setRentContractId(rentContractId); |
|
|
|
bq.setIsPreview(EnumYesOrNo.NO.getCode()); |
|
|
|
bq.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
//bq.setBillType(EnumBillAllType.RENT.getCode()); |
|
|
|
//bq.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId()); |
|
|
|
//bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode()); |
|
|
|
@@ -234,6 +239,7 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public PageInfo<WxAllBill> getBillList(WxShop wxShop,Integer pageNum, Integer pageSize) { |
|
|
|
WxAllBill wxAllBill = new WxAllBill(); |
|
|
|
wxAllBill.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
updateQueryParm(wxShop, wxAllBill,wxShop.getStarttime(),wxShop.getEndtime()); |
|
|
|
wxAllBill.setIsPreview(EnumYesOrNo.NO.getCode()); |
|
|
|
wxAllBill.setSortColumns("starttime asc"); |
|
|
|
@@ -242,7 +248,9 @@ public class WxBillAllHelper { |
|
|
|
|
|
|
|
public List<WxAllBill> getMerchantBillList(WxShop wxShop) { |
|
|
|
WxAllBill wxBillRent = new WxAllBill(); |
|
|
|
wxBillRent.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime()); |
|
|
|
wxBillRent.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
wxBillRent.setSortColumns("starttime asc"); |
|
|
|
return wxAllBillService.list(wxBillRent); |
|
|
|
} |
|
|
|
@@ -254,6 +262,7 @@ public class WxBillAllHelper { |
|
|
|
public List<WxBillNotify> getBillNotifyList(WxShop wxShop,Integer notifyed) { |
|
|
|
|
|
|
|
WxAllBill wxBillRent = new WxAllBill(); |
|
|
|
wxBillRent.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
updateQueryParm(wxShop, wxBillRent,wxShop.getStarttime(),wxShop.getEndtime()); |
|
|
|
wxBillRent.setNotifyed(notifyed); |
|
|
|
wxBillRent.setSortColumns("starttime asc"); |
|
|
|
|