From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 69 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 12 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 6d828f6..3fe9889 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,9 +4,11 @@
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;
+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;
@@ -15,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -34,6 +37,10 @@
@PostMapping(value = "/order/save")
R<Boolean> save(@RequestBody OrderRequest orderRequest);
+
+ @PostMapping(value = "/order/edit")
+ R<Boolean> edit(@RequestBody OrderRequest orderRequest);
+
/**
* 根据改派申请id获取订单详情
*
@@ -52,6 +59,8 @@
*/
@GetMapping(value = "/order/detail")
R<Order> detail(@RequestParam("id") String id);
+ @PostMapping(value = "/order/msgCount")
+ R msgCount(@RequestParam("orderId") String orderId);
/**
* 更改订单信息
@@ -80,17 +89,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导出
@@ -119,6 +122,9 @@
@PostMapping(value = "/order/queryPage")
R<Page<Order>> queryPage(@RequestBody OrderQueryRequest orderQueryRequest);
+ @PostMapping(value = "/order/queryPage1")
+ R<List<String>> queryPage1(@RequestBody OrderQueryRequest orderQueryRequest);
+
/**
* 订单列表
*
@@ -137,6 +143,18 @@
*/
@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);
+
+ @PostMapping(value = "/order/queryIdsBycodeAndSite")
+ R<List<Integer>> queryIdsBycodeAndSite(@RequestParam("cityList") List<String> cityList,@RequestParam("siteIds")List<String> siteIds);
/**
* 更改订单状态且清空到达时间
@@ -168,6 +186,9 @@
@PostMapping(value = "/order/orderCountHome")
R<OrderResultVO> orderCountHome(@RequestBody OrderCountRequest orderCount);
+ @PostMapping(value = "/order/workday")
+ R<List<Order>> workday(@RequestBody Integer workId);
+
/**
* 用户所关联订单记录分页列表
*
@@ -177,9 +198,20 @@
* @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,
+ @RequestParam("siteIds") List<String> siteIds);
+ @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,
+ @RequestParam("siteIds") String [] siteIds);
/**
* 更改订单提现状态
@@ -200,8 +232,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 +403,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 +422,10 @@
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);
+ @GetMapping(value = "/order/updateArrivalTime")
+ R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime);
}
--
Gitblit v1.7.1