| @@ -120,24 +120,6 @@ public class WxBillAllController extends BaseController { | |||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| /** | |||||
| * 应收、承付商户详情 | |||||
| * @param wxBillAll | |||||
| * @return | |||||
| */ | |||||
| @GetMapping("receiveAndPayMerchantDetail") | |||||
| @SystemControllerLog(description = "账单管理-应收、承付商户详情") | |||||
| @ApiOperation("应收、承付商户详情") | |||||
| public ResultData receiveAndPayMerchantDetail(@ModelAttribute WxBillAll wxBillAll) { | |||||
| logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantDetail"); | |||||
| if (null == wxBillAll) { | |||||
| wxBillAll = new WxBillAll(); | |||||
| } | |||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| Map<String, Object> result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); | |||||
| return new ResultData(result); | |||||
| } | |||||
| /** | /** | ||||
| * 导出应收、承付商户列表 | * 导出应收、承付商户列表 | ||||
| * @param wxBillAll | * @param wxBillAll | ||||
| @@ -56,13 +56,6 @@ public interface WxBillAllService { | |||||
| */ | */ | ||||
| Map<String, Object> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); | Map<String, Object> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); | ||||
| /** | |||||
| * 应收和承付商户分页详情 | |||||
| * | |||||
| * @return | |||||
| */ | |||||
| Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record); | |||||
| void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response); | void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response); | ||||
| void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); | void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); | ||||
| @@ -1576,11 +1576,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); | excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); | ||||
| } | } | ||||
| @Override | |||||
| public Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record) { | |||||
| return null; | |||||
| } | |||||
| @Override | @Override | ||||
| public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { | public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { | ||||
| List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); | List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); | ||||