diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 695b757ee..2392d43a5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -120,6 +120,24 @@ public class WxBillAllController extends BaseController { 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 result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); + return new ResultData(result); + } + /** * 导出应收、承付商户列表 * @param wxBillAll diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 79ff596be..0badeabec 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -49,4 +49,6 @@ public interface WxBillAllMapper { */ List> getReceiveAndPayBillAsPage(WxBillAll record); + Map getReceiveAndPayBillDetail(WxBillAll record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 847f04673..e1ce31361 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -56,6 +56,13 @@ public interface WxBillAllService { */ Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); + /** + * 应收和承付商户分页详情 + * + * @return + */ + Map getReceiveAndPayBillDetail(WxBillAll record); + void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response); void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 78637436a..63c709e31 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1576,6 +1576,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); } + @Override + public Map getReceiveAndPayBillDetail(WxBillAll record) { + return null; + } + @Override public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { List> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index be80b6977..67e706486 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -642,7 +642,7 @@