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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 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;
@@ -38,30 +37,41 @@
    R<Agreement> dataInfo(@RequestParam("type") Integer type);

    /**
     * 新增订单改派
     * 获取司机操作指南
     *
     * @param changeDispatch 改派信息
     * @return 详细数据
     * @return 详情操作指南
     */
    @PostMapping(value = "/changeDispatch/save")
    R<Boolean> changeDispatchSave(@RequestBody ChangeDispatch changeDispatch);
    @GetMapping(value = "/agreement/operate")
    R<Agreement> operate();

    /**
     * 订单改派详情
     * 根据类型获取注册协议、隐私政策
     * -- 用户端远程调用
     *
     * @param id 订单id
     * @return 改派订单
     * @param type 查询类型
     * @return 详情
     */
    @GetMapping(value = "/changeDispatch/one")
    R<ChangeDispatch> changeDispatchOne(@RequestParam("id") Integer id);
    @GetMapping(value = "/agreement/agreementPolicy")
    R<Agreement> agreementPolicy(@RequestParam("type") Integer type);

    /**
     * 系统通知列表
     *
     * @return 通知公告列表
     */
    @GetMapping(value = "/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);

    /**
     * 轮播图列表
@@ -93,7 +103,16 @@
     * @return 奖品列表
     */
    @GetMapping(value = "/prize/prizeList")
    R<List<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);

    /**
     * 修改系统设置-关闭/开启审核
@@ -103,4 +122,16 @@
    @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);

}