From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 ee502f6..c5d9aca 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
@@ -6,11 +6,15 @@
import com.ruoyi.order.factory.RemoteOrderGoodsFallbackFactory;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.OrderGood;
+import com.ruoyi.order.vo.Price;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
+import java.util.Set;
@FeignClient(contextId = "RemoteOrderGoodsClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteOrderGoodsFallbackFactory.class)
public interface RemoteOrderGoodsClient {
@@ -27,9 +31,34 @@
@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查找订单列表
*/
- @PostMapping("/order/getOrderListByUserIdAndGoodsId")
- public R<List<Order>> getOrderListByUserIdAndGoodsId(@RequestBody OrderGood orderGood);
+ @GetMapping("/order/getOrderListByUserIdAndGoodsId")
+ public R<List<Order>> getOrderListByUserIdAndGoodsId(@RequestParam("userId") Long userId, @RequestParam("goodsId") Integer goodsId);
+
+ /**
+ * 更新订单状态
+ */
+ @PostMapping("/order/updateOrderStatus")
+ public R<Void> updateOrderStatus(@RequestBody Order order);
+
+ /**
+ * 预约技师
+ */
+ @PostMapping("/order/subscribe")
+ public R<Void> subscribe(@RequestParam(value = "id" , required = false) Long id ,@RequestParam(value = "technicianId", required = false) Integer technicianId);
+
+
+
+ @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