From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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..6693485 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
@@ -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;
@@ -80,17 +81,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导出
@@ -177,7 +172,7 @@
* @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);
@@ -372,6 +367,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 +386,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);
+
}
--
Gitblit v1.7.1