From 4be3d3f27b9c3bf2b6e581f89816f372d742afd0 Mon Sep 17 00:00:00 2001 From: fengb Date: Sun, 3 Sep 2023 12:16:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E4=BD=A3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengb --- .../controller/ReturnCommissionController.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java index 58b12fc9..f0017f66 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java @@ -69,11 +69,22 @@ public class ReturnCommissionController { } } - @RequestMapping(value = "/list", method = RequestMethod.GET) - @ApiOperation(value = "查询商铺的返佣记录",httpMethod = "GET") - public Result list(@ApiParam(value = "商铺id",required = true) @RequestParam(value = "shopId",required = true) String shopId) { + @RequestMapping(value = "/listWithNoReturn", method = RequestMethod.GET) + @ApiOperation(value = "查询商铺未处理的返佣记录",httpMethod = "GET") + public Result listWithNoReturn(@ApiParam(value = "商铺id",required = true) @RequestParam(value = "shopId",required = true) String shopId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("shop_id",shopId); + queryWrapper.eq("status","0"); + List list = returnCommissionService.list(queryWrapper); + return new ResultUtil>().setData(list); + } + + @RequestMapping(value = "/listWithReturned", method = RequestMethod.GET) + @ApiOperation(value = "查询商铺已处理完成的返佣记录",httpMethod = "GET") + public Result listWithReturned(@ApiParam(value = "商铺id",required = true) @RequestParam(value = "shopId",required = true) String shopId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("shop_id",shopId); + queryWrapper.ne("status","0"); List list = returnCommissionService.list(queryWrapper); return new ResultUtil>().setData(list); }