From 67157345fe1878681e39ec186ef37ff6b3b5c1fc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 03 八月 2024 18:07:00 +0800
Subject: [PATCH] 8.3
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 6693485..3458646 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -35,6 +35,10 @@
@PostMapping(value = "/order/save")
R<Boolean> save(@RequestBody OrderRequest orderRequest);
+
+ @PostMapping(value = "/order/edit")
+ R<Boolean> edit(@RequestBody OrderRequest orderRequest);
+
/**
* 根据改派申请id获取订单详情
*
@@ -133,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);
+
/**
* 更改订单状态且清空到达时间
*
@@ -176,6 +184,15 @@
@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);
+
/**
* 更改订单提现状态
*
@@ -195,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);
/**
* 师傅端-订单列表
--
Gitblit v1.7.1