diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index ebcd99cf2..184189a6f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -2,7 +2,6 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; @@ -21,8 +20,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * @author gongbiao */ @@ -51,11 +48,15 @@ public class WxCouponPasswordController extends BaseController { @ApiOperation("可发送卡数据") @GetMapping("/findCouponList") + @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 findCouponList() { + public ResultData findCouponList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::findCouponList"); - List voList = wxCouponPasswordService.findCouponList(getTenantId()); - return new ResultData(Result.SUCCESS, "查询成功", voList); + wxCouponPassword.setTenantId(getTenantId()); + final PageInfo page = wxCouponPasswordService.findCouponList(wxCouponPassword, pageNum, pageSize); + return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordCountInfoVO.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordCountInfoVO.java index acbd15f6c..60d3ee2ec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordCountInfoVO.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordCountInfoVO.java @@ -11,4 +11,6 @@ public class WxCouponPasswordCountInfoVO { private Long couponId; private String couponName; private Long couponCount; + private String price; + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java index 5cd6a7559..6eb6d0651 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java @@ -6,7 +6,6 @@ import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.List; public interface WxCouponPasswordService { @@ -58,9 +57,6 @@ public interface WxCouponPasswordService { */ void mkPasswords(String tenantId, Long couponId, Integer inventory); - - List findCouponList(String tenantId); - /** * 导出兑换码 * @param request @@ -69,4 +65,6 @@ public interface WxCouponPasswordService { */ void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponPassword couponPassword); + PageInfo findCouponList(WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 27bbfa630..c557fc3ca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -92,13 +92,6 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { wxCouponPasswordMapper.deleteByPrimaryKey(id); } - @Override - public List findCouponList(String tenantId) { - WxCouponPassword wxCouponPassword = new WxCouponPassword(); - wxCouponPassword.setTenantId(tenantId); - return wxCouponPasswordMapper.findCouponCountInfo(wxCouponPassword); - } - @Override public void mkPasswords(String tenantId, Long couponId, Integer inventory) { String strAll = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -163,6 +156,11 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { } + @Override + public PageInfo findCouponList(WxCouponPassword record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponPasswordMapper.findCouponCountInfo(record)); + } + /* public static void main(String[] args) { WxCouponPasswordServiceImpl ll = new WxCouponPasswordServiceImpl(); diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 0f970e210..a3eda0048 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -119,11 +119,12 @@ +