From d9609af285755011115e8f4c64634740f7dd05c2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 23 十二月 2024 10:36:01 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
index 8d1c522..efeec68 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
@@ -31,6 +31,12 @@
@PostMapping("/order/getOrderListByIds")
public R<List<Order>> getOrderListByIds(@RequestBody List<Long> orderIds);
+ @PostMapping("/order/byUserId")
+ public R<List<Order>> byUserId(@RequestParam("appUserId")Long appUserId);
+ @PostMapping("/order/byShopId")
+ public R<List<Order>> byShopId(@RequestParam("shopId")Integer shopId);
+
+
/**
* 根据用户id和商品id查找订单列表
*/
@@ -57,4 +63,6 @@
@GetMapping("/shopping-cart/getGoodsPrice")
public R<Price> getGoodsPrice(@RequestParam("appUserId") Long appUserId, @RequestParam("goodsId") Integer goodsId, @RequestParam("shopId") Integer shopId);
+ @PostMapping("/order/getLastOrder")
+ public R<Order> getLastOrder(@RequestParam("appUserId") Long appUserId);
}
--
Gitblit v1.7.1