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 a9269d4ac..846aa1604 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -98,6 +98,28 @@ public class WxBillAllController extends BaseController { } + /** + * 应收、承付商户列表 + * @param wxBillAll + * @param pageNum + * @param pageSize + * @return + */ + @GetMapping("receiveAndPayMerchantlist") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "费用收缴数据-欠缴商户列表") + public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist"); + if (null == wxBillAll) { + wxBillAll = new WxBillAll(); + } + wxBillAll.setTenantId(getTenantId()); + Map result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); + return new ResultData(result); + } + @ApiOperation("导出欠缴商户列表") @GetMapping("/exportOweMerchantlist") @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 7ff113c84..78983cc56 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -133,4 +133,8 @@ public class WxBillAll extends BaseEntity { @Transient private Long newLatePrice; + @Transient + @SortColumn(column = "payOut") + private Integer payOut; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 66fdede14..79ff596be 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -42,4 +42,11 @@ public interface WxBillAllMapper { */ List> getOweBillAsPage(WxBillAll record); + /** + * 应收和承付商户分页列表 + * + * @return + */ + List> getReceiveAndPayBillAsPage(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 1950f3b16..10e9a34cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -48,6 +48,15 @@ public interface WxBillAllService { */ Map getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); + + /** + * 应收和承付商户分页列表 + * + * @return + */ + Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); + + void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); void exportWaitMerchant(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 a6ebf0228..53fcc0f4f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1528,6 +1528,14 @@ public class WxBillAllServiceImpl implements WxBillAllService { return result; } + @Override + public Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { + PageInfo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getReceiveAndPayBillAsPage(record)); + Map result = new HashMap<>(); + result.put("pageInfo", pageInfo); + return result; + } + /** * 使用java正则表达式去掉多余的.与0 * diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 15802a180..040a23f14 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -619,5 +619,60 @@ order by totalOwe desc + + +