8.3

luodangjia

2024-08-03 67157345fe1878681e39ec186ef37ff6b3b5c1fc

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.core.vo.Path;
import com.ruoyi.order.api.entity.*;
import com.ruoyi.order.api.factory.OrderFallbackFactory;
import com.ruoyi.order.api.request.OrderCountDataRequest;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +34,10 @@
     */
    @PostMapping(value = "/order/save")
    R<Boolean> save(@RequestBody OrderRequest orderRequest);


    @PostMapping(value = "/order/edit")
    R<Boolean> edit(@RequestBody OrderRequest orderRequest);

    /**
     * 根据改派申请id获取订单详情
@@ -80,17 +85,11 @@
    /**
     * 订单统计
     *
     * @param name     师傅姓名
     * @param phone    师傅电话
     * @param pageNum  页码
     * @param pageSize 每页条数
     * @param request 查询参数
     * @return 分页
     */
    @GetMapping(value = "/order/orderCount")
    R<Page<OrderCountVO>> orderCount(@RequestParam(value = "name", required = false) String name,
                                     @RequestParam(value = "phone", required = false) String phone,
                                     @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);
    @PostMapping(value = "/order/orderCount")
    R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest request);

    /**
     * 订单列表-excel导出
@@ -138,6 +137,10 @@
    @PostMapping(value = "/order/updateState")
    R<Boolean> updateState(@RequestParam("orderId") String orderId, @RequestParam("state") Integer state);


    @PostMapping(value = "/order/queryIdsBycode")
    R<List<Integer>> queryIdsBycode(@RequestBody List<String> cityList);

    /**
     * 更改订单状态且清空到达时间
     *
@@ -177,9 +180,18 @@
     * @return 分页列表
     */
    @GetMapping(value = "/order/orderList")
    R<IPage<Order>> orderList(@RequestParam("userId") Integer userId,
    R<Page<Order>> orderList(@RequestParam("userId") Integer userId,
                              @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);

    @GetMapping(value = "/order/orderList1")
    R<Page<Order>> orderList1(@RequestParam("userId") Integer userId, @RequestParam("cityList") List<String> cityList,
                             @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);
    @GetMapping(value = "/order/workOrderList")
    R<Page<Order>> workOrderList(@RequestParam("workId") Integer workId,
                             @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);

    /**
     * 更改订单提现状态
@@ -200,8 +212,7 @@
     * @return 交易额
     */
    @GetMapping(value = "/order/tradeMoney")
    R<BigDecimal> tradeMoney(@RequestParam("cityList") List<String> cityList,
                             @RequestParam("type") String type);
    R<BigDecimal> tradeMoney(@RequestBody MoneyQueryRequest moneyQueryRequest);

    /**
     * 师傅端-订单列表
@@ -372,6 +383,14 @@
    R<Boolean> placeOrder(@RequestBody UserOrderRequest userOrderRequest);

    /**
     * 判断用户是否下单
     *
     * @param userId 用户id
     */
    @GetMapping(value = "/order/orderByUserId")
    R<Boolean> orderByUserId(@RequestParam("userId") Integer userId);

    /**
     * 站点详情
     *
     * @param orderId   订单id
@@ -383,4 +402,9 @@
    R<Boolean> supplementAllowance(@RequestParam("orderId") String orderId,
                                   @RequestParam("prizeName") String prizeName);

    @GetMapping("/oldData/order")
    R<String> oldData(@RequestParam("index") Integer index,
                      @RequestParam("pageNum") Integer pageNum,
                      @RequestParam("pageSize") Integer pageSize);

}