|
|
|
@@ -121,7 +121,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); |
|
|
|
} |
|
|
|
@@ -190,7 +190,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
PageInfo<WxMerchantBillVo> page = getVoPage(wxMerchant, 1, 10000,null); |
|
|
|
excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false); |
|
|
|
@@ -359,7 +359,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
if (isOwe) { |
|
|
|
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
|
@@ -420,7 +420,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
|
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); |
|
|
|
@@ -451,7 +451,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
|
wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); |
|
|
|
@@ -617,7 +617,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); |
|
|
|
} |
|
|
|
@@ -729,7 +729,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
record.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
record.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
record.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
record.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
if (null != record.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { |
|
|
|
@@ -752,7 +752,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
wxBillRent.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxBillRent.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
wxBillRent.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
if (null != wxBillRent.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { |
|
|
|
@@ -775,7 +775,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null != dataRule) { |
|
|
|
record.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
record.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
record.setShopTypeForRule(dataRule.getShopType()); |
|
|
|
record.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
if (null != record.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { |
|
|
|
|