From e42cd39c92b627ffa900b131912d9137a98506d7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 10:41:29 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 1f95358..de0971d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -212,6 +212,15 @@
     }
 
 
+    @PostMapping("/byUserId")
+    public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId){
+        return R.ok(orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).list());
+    }
+    @PostMapping("/byShopId")
+    public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
+        return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).groupBy(Order::getAppUserId).list());
+    }
+
     
     
     @ResponseBody

--
Gitblit v1.7.1