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/WxRiderController.java |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 91 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java b/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
new file mode 100644
index 0000000..5d81a0c
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
@@ -0,0 +1,91 @@
+package com.oying.modules.rider.rest;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.oying.modules.rider.domain.*;
+import com.oying.modules.rider.domain.dto.RiderIncomeDetailQueryCriteria;
+import com.oying.modules.rider.domain.dto.RiderOrderRecordQueryCriteria;
+import com.oying.modules.rider.domain.dto.RiderWithdrawalRecordQueryCriteria;
+import com.oying.modules.rider.service.*;
+import com.oying.utils.PageResult;
+import com.oying.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @author pxb
+ * @date 2025-06-18
+ **/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "骑手微信小程序接口")
+@RequestMapping("/api/wx/rider")
+public class WxRiderController {
+
+    private final RiderIncomeDetailService riderIncomeDetailService;
+
+    private final RiderWalletInfoService riderWalletInfoService;
+
+    private final RiderWithdrawalRecordService riderWithdrawalRecordService;
+
+    private final RiderInfoService riderInfoService;
+
+    private final RiderOrderRecordService riderOrderRecordService;
+
+
+    @GetMapping("getRiderSourceInfo/{riderId}")
+    @ApiOperation("查询第三方数据骑手信息")
+    @PreAuthorize("@el.check('riderInfo:list')")
+    public ResponseEntity<?> getRiderSourceInfo(@PathVariable String riderId) {
+        RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId);
+        return ResponseEntity.ok(R.success(riderInfo));
+    }
+
+    @GetMapping("syncRiderSourceInfo/{sourcePlatform}")
+    @ApiOperation("同步查询第三方骑手信息 LY")
+    @PreAuthorize("@el.check('riderInfo:edit')")
+    public ResponseEntity<?> syncRiderSourceInfo(@PathVariable String sourcePlatform) {
+        riderInfoService.syncRiderSourceInfo(sourcePlatform);
+        return ResponseEntity.ok(R.success());
+    }
+
+    @GetMapping("getRiderWalletInfo/{riderId}")
+    @ApiOperation("查询骑手钱包信息")
+    @PreAuthorize("@el.check('riderWalletInfo:list')")
+    public ResponseEntity<?> getRiderWalletInfo(@PathVariable String riderId) {
+        RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(riderId);
+        return ResponseEntity.ok(R.success(riderWalletInfo));
+    }
+
+    @GetMapping("getRiderIncomeDetail")
+    @ApiOperation("查询骑手订单收入明细分页")
+    @PreAuthorize("@el.check('riderIncomeDetail:list')")
+    public ResponseEntity<?> getRiderIncomeDetail(RiderIncomeDetailQueryCriteria criteria) {
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        PageResult<RiderIncomeDetail> riderIncomeDetails = riderIncomeDetailService.queryAll(criteria, page);
+        return ResponseEntity.ok(R.success(riderIncomeDetails));
+    }
+
+    @GetMapping("getRiderWithdrawalRecord")
+    @ApiOperation("查询骑手提现记录分页")
+    @PreAuthorize("@el.check('riderWithdrawalRecord:list')")
+    public ResponseEntity<?> getRiderWithdrawalRecord(RiderWithdrawalRecordQueryCriteria criteria) {
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        PageResult<RiderWithdrawalRecord> riderIncomeDetails = riderWithdrawalRecordService.queryAll(criteria, page);
+        return ResponseEntity.ok(R.success(riderIncomeDetails));
+    }
+
+    @GetMapping("getRiderOrderRecord")
+    @ApiOperation("查询骑手订单记录分页")
+    @PreAuthorize("@el.check('riderOrderRecord:list')")
+    public ResponseEntity<?> getRiderOrderRecord(RiderOrderRecordQueryCriteria criteria) {
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        PageResult<RiderOrderRecord> riderOrderRecordPageResult = riderOrderRecordService.queryAll(criteria, page);
+        return ResponseEntity.ok(R.success(riderOrderRecordPageResult));
+    }
+
+}

--
Gitblit v1.9.3