From bd375f4fe8081c0ca612d72ed06c47ab3f89d68d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb'

---
 oying-system/src/main/java/com/oying/modules/rider/rest/RiderIncomeDetailController.java |   73 ++++++++++++++++++++++++++++++++++++
 1 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/rest/RiderIncomeDetailController.java b/oying-system/src/main/java/com/oying/modules/rider/rest/RiderIncomeDetailController.java
new file mode 100644
index 0000000..06079cf
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/rest/RiderIncomeDetailController.java
@@ -0,0 +1,73 @@
+package com.oying.modules.rider.rest;
+
+import com.oying.annotation.Log;
+import com.oying.modules.rider.domain.dto.RiderIncomeDetailQueryCriteria;
+import com.oying.modules.rider.service.RiderIncomeDetailService;
+import com.oying.modules.rider.domain.RiderIncomeDetail;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.oying.utils.PageResult;
+
+/**
+* @author pxb
+* @date 2025-06-18
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "骑手收入明细")
+@RequestMapping("/api/rider/riderIncomeDetail")
+public class RiderIncomeDetailController {
+
+    private final RiderIncomeDetailService riderIncomeDetailService;
+
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('riderIncomeDetail:list')")
+    public void exportRiderIncomeDetail(HttpServletResponse response, RiderIncomeDetailQueryCriteria criteria) throws IOException {
+        riderIncomeDetailService.download(riderIncomeDetailService.queryAll(criteria), response);
+    }
+
+    @GetMapping
+    @ApiOperation("查询骑手收入明细")
+    @PreAuthorize("@el.check('riderIncomeDetail:list')")
+    public ResponseEntity<PageResult<RiderIncomeDetail>> queryRiderIncomeDetail(RiderIncomeDetailQueryCriteria criteria){
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        return new ResponseEntity<>(riderIncomeDetailService.queryAll(criteria,page),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增骑手收入明细")
+    @ApiOperation("新增骑手收入明细")
+    @PreAuthorize("@el.check('riderIncomeDetail:add')")
+    public ResponseEntity<Object> createRiderIncomeDetail(@Validated @RequestBody RiderIncomeDetail resources){
+        riderIncomeDetailService.create(resources);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改骑手收入明细")
+    @ApiOperation("修改骑手收入明细")
+    @PreAuthorize("@el.check('riderIncomeDetail:edit')")
+    public ResponseEntity<Object> updateRiderIncomeDetail(@Validated @RequestBody RiderIncomeDetail resources){
+        riderIncomeDetailService.update(resources);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @DeleteMapping
+    @Log("删除骑手收入明细")
+    @ApiOperation("删除骑手收入明细")
+    @PreAuthorize("@el.check('riderIncomeDetail:del')")
+    public ResponseEntity<Object> deleteRiderIncomeDetail(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+        riderIncomeDetailService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

--
Gitblit v1.9.3