From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 ba98a22..5acac8c 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.vo.PaperInVo;
import com.ruoyi.common.core.vo.Path;
import com.ruoyi.order.api.entity.*;
import com.ruoyi.order.api.factory.OrderFallbackFactory;
@@ -34,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 +138,15 @@
@PostMapping(value = "/order/updateState")
R<Boolean> updateState(@RequestParam("orderId") String orderId, @RequestParam("state") Integer state);
+ @PostMapping(value = "/order/count")
+ R<Boolean> count(@RequestParam("orderId") String orderId);
+
+ @PostMapping(value = "/order/papercount")
+ R<List<PaperInVo>> papercount(@RequestParam("workId") String workId,@RequestParam("date") String date);
+
+ @PostMapping(value = "/order/queryIdsBycode")
+ R<List<Integer>> queryIdsBycode(@RequestBody List<String> cityList);
+
/**
* 更改订单状态且清空到达时间
*
@@ -163,6 +177,9 @@
@PostMapping(value = "/order/orderCountHome")
R<OrderResultVO> orderCountHome(@RequestBody OrderCountRequest orderCount);
+ @PostMapping(value = "/order/workday")
+ R<List<Order>> workday(@RequestBody Integer workId);
+
/**
* 用户所关联订单记录分页列表
*
@@ -172,9 +189,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);
/**
* 更改订单提现状态
@@ -195,8 +221,7 @@
* @return 交易额
*/
@GetMapping(value = "/order/tradeMoney")
- R<BigDecimal> tradeMoney(@RequestParam("cityList") List<String> cityList,
- @RequestParam("type") String type);
+ R<BigDecimal> tradeMoney(@RequestBody MoneyQueryRequest moneyQueryRequest);
/**
* 师傅端-订单列表
@@ -367,6 +392,14 @@
R<Boolean> placeOrder(@RequestBody UserOrderRequest userOrderRequest);
/**
+ * 判断用户是否下单
+ *
+ * @param userId 用户id
+ */
+ @GetMapping(value = "/order/orderByUserId")
+ R<Boolean> orderByUserId(@RequestParam("userId") Integer userId);
+
+ /**
* 站点详情
*
* @param orderId 订单id
--
Gitblit v1.7.1