Merge remote-tracking branch 'origin/dev' into dev

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)
+    @RequestMapping(value = "/listWithNoReturn", method = RequestMethod.GET)
-    @ApiOperation(value = "查询商铺的返佣记录",httpMethod = "GET")
+    @ApiOperation(value = "查询商铺未处理的返佣记录",httpMethod = "GET")
-    public Result list(@ApiParam(value = "商铺id",required = true) @RequestParam(value = "shopId",required = true) String shopId) {
+    public Result listWithNoReturn(@ApiParam(value = "商铺id",required = true) @RequestParam(value = "shopId",required = true) String shopId) {
         QueryWrapper<ReturnCommission> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("shop_id",shopId);
+        queryWrapper.eq("status","0");
+        List<ReturnCommission> list = returnCommissionService.list(queryWrapper);
+        return new ResultUtil<List<ReturnCommission>>().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<ReturnCommission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("shop_id",shopId);
+        queryWrapper.ne("status","0");
         List<ReturnCommission> list = returnCommissionService.list(queryWrapper);
         return new ResultUtil<List<ReturnCommission>>().setData(list);
     }