|
|
|
@@ -121,6 +121,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); |
|
|
|
} |
|
|
|
@@ -189,6 +190,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
PageInfo<WxMerchantBillVo> page = getVoPage(wxMerchant, 1, 10000,null); |
|
|
|
excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false); |
|
|
|
@@ -355,6 +357,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
if (isOwe) { |
|
|
|
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
|
@@ -415,6 +418,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
|
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); |
|
|
|
@@ -445,6 +449,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
|
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); |
|
|
|
@@ -609,6 +614,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); |
|
|
|
} |
|
|
|
@@ -720,6 +726,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
record.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
record.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
record.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
if (null != record.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { |
|
|
|
@@ -742,6 +749,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxBillRent.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxBillRent.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
if (null != wxBillRent.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { |
|
|
|
@@ -764,6 +772,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
record.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
record.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
record.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
} |
|
|
|
if (null != record.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { |
|
|
|
|