From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
index 1da5305..2f018b3 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
@@ -4,10 +4,9 @@
import com.ruoyi.admin.api.factory.AdminFallbackFactory;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -25,7 +24,7 @@
* @param phone 手机号
* @return 订单信息
*/
- @GetMapping(value = "/admin/order/queryList")
+ @GetMapping(value = "/order/queryList")
R<List<Order>> queryList(@RequestParam("phone") String phone);
/**
@@ -34,32 +33,52 @@
* @param type 查询类型
* @return 详细数据
*/
- @GetMapping(value = "/admin/agreement/dataInfo")
+ @GetMapping(value = "/agreement/dataInfo")
R<Agreement> dataInfo(@RequestParam("type") Integer type);
/**
- * 新增订单改派
+ * 获取司机操作指南
*
- * @param changeDispatch 改派信息
- * @return 详细数据
+ * @return 详情操作指南
*/
- @PostMapping(value = "/admin/changeDispatch/save")
- R<Boolean> changeDispatchSave(@RequestBody ExchangeDispatch changeDispatch);
+ @GetMapping(value = "/agreement/operate")
+ R<Agreement> operate();
+
+ /**
+ * 根据类型获取注册协议、隐私政策
+ * -- 用户端远程调用
+ *
+ * @param type 查询类型
+ * @return 详情
+ */
+ @GetMapping(value = "/agreement/agreementPolicy")
+ R<Agreement> agreementPolicy(@RequestParam("type") Integer type);
/**
* 系统通知列表
*
* @return 通知公告列表
*/
- @GetMapping(value = "/admin/notices/list")
+ @GetMapping(value = "/notices/noticesList")
R<List<Notices>> noticesList();
+
+ /**
+ * 系统通知详情
+ * -- 远程调用
+ *
+ * @param id 主键id
+ * @return 详情
+ */
+ @ApiOperation(value = "系统通知详情", tags = {"后台-系统设置-系统通知管理"})
+ @GetMapping(value = "/notices/noticesDetail")
+ R<Notices> noticesDetail(@RequestParam("id") Integer id);
/**
* 轮播图列表
*
* @return 轮播图列表
*/
- @GetMapping(value = "/admin/rotate/bannerList")
+ @GetMapping(value = "/rotate/bannerList")
R<List<Rotate>> bannerList();
/**
@@ -67,7 +86,7 @@
*
* @return 服务优势列表
*/
- @GetMapping(value = "/admin/advantage/advantageList")
+ @GetMapping(value = "/advantage/advantageList")
R<List<ServeAdvantage>> advantageList();
/**
@@ -75,7 +94,7 @@
*
* @return 列表
*/
- @GetMapping(value = "/admin/problem/problemList")
+ @GetMapping(value = "/problem/problemList")
R<List<Problem>> problemList();
/**
@@ -83,15 +102,36 @@
*
* @return 奖品列表
*/
- @GetMapping(value = "/admin/prize/list")
- R<List<Prize>> prizeList();
+ @GetMapping(value = "/prize/prizeList")
+ R<List<Prize>> prizeList(@RequestParam("serveId") Integer serveId);
+
+ /**
+ * 奖品详情 -- 远程调用
+ *
+ * @param id 奖品id
+ * @return 详情
+ */
+ @GetMapping(value = "/prize/prizeDetail")
+ R<Prize> prizeDetail(@RequestParam("id") String id);
/**
* 修改系统设置-关闭/开启审核
*
* @return 操作结果
*/
- @GetMapping(value = "/withdrawProcess")
- R<WithdrawalSetting> withdrawProcess();
+ @GetMapping(value = "/userManage/withdrawProcess")
+ R<WithdrawalSetting> withdrawProcess();
+
+ /**
+ * 加盟商管辖城市详情
+ *
+ * @param id 加盟商信息id
+ * @return 加盟商管辖城市详情
+ */
+ @GetMapping(value = "/franchisee/cityDetail")
+ R<List<String>> cityDetail(@RequestParam("id") Integer id);
+
+ @GetMapping(value = "/franchisee/getWorkPic")
+ R<String> getWorkPic(@RequestParam("id") Integer id);
}
--
Gitblit v1.7.1