From 67f842850707834b84aaeadb506554cfd49a24f7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 28 May 2021 15:43:18 +0800 Subject: [PATCH] tt --- .../service/impl/WxMerchantServiceImpl.java | 5 +---- .../iformall/controller/WxMerchantController.java | 14 ++++++++++++++ .../iformall/schedule/TtOrderExpiringSchedule.java | 3 +-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index ad79dfc48..03fd50c0d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -104,10 +104,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { - PageHelper.startPage(pageIndex, pageSize); - List merchants = wxMerchantMapper.findList(record); - PageInfo pageInfo = new PageInfo<>(merchants); - return pageInfo; + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); } @Override diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 4f75a17d3..fadd926cf 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -47,6 +47,20 @@ public class WxMerchantController extends BaseController { return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize)); } + @ApiOperation("分页列表接口") + @GetMapping("listV1") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData listV1(@ModelAttribute WxMerchant merchant, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); + if (null == merchant) merchant = new WxMerchant(); + merchant.updateTenantInfo(getTenantInfo()); + merchant.setStatus(EnumMerchantStatus.VALID.getCode()); + merchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); + return new ResultData(wxMerchantService.listAsPage(merchant, pageNum, pageSize)); + } + @ApiOperation("根据code查询接口") @GetMapping("/findByCode") @ApiImplicitParam(name = "merchantCode", value = "merchantCode", dataType = "String", paramType = "query", required = true) diff --git a/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java b/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java index a19f421d3..4ca0f0df3 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java +++ b/mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java @@ -36,8 +36,7 @@ public class TtOrderExpiringSchedule { @Scheduled(cron = "0 0 4 * * ?") //每天四点入账 public void orderRecordedSchedule() { - WxMerchant merchant = new WxMerchant(); - wxMerchantMapper.findList(merchant); + } } \ No newline at end of file