From a015d2984832d4b20227fb6864f3cbad0e2f6ba8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:39:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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 8a35d2e..19394a0 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,6 +6,7 @@
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;
@@ -22,35 +23,42 @@
* 查询指定商品订单
*/
@PostMapping("/order-good/selectGoodsOrder")
- public R<List<OrderGood>> goodsOrder(@RequestBody List<Long> goodsIds);
+ R<List<OrderGood>> goodsOrder(@RequestBody List<Long> goodsIds);
/**
* 根据ids查找订单列表
*/
@PostMapping("/order/getOrderListByIds")
- public R<List<Order>> getOrderListByIds(@RequestBody List<Long> orderIds);
+ R<List<Order>> getOrderListByIds(@RequestBody List<Long> orderIds);
+
+ @PostMapping("/order/byUserId")
+ R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId);
+ @PostMapping("/order/byShopId")
+ R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId);
+
/**
* 根据用户id和商品id查找订单列表
*/
- @GetMapping("/order/getOrderListByUserIdAndGoodsId")
- public R<List<Order>> getOrderListByUserIdAndGoodsId(@RequestParam("userId") Long userId, @RequestParam("goodsId") Integer goodsId);
+ @GetMapping("/order-good/getOrderListByUserIdAndGoodsId")
+ R<List<Order>> getOrderListByUserIdAndGoodsId(@RequestParam("userId") Long userId, @RequestParam("goodsId") Integer goodsId);
/**
* 更新订单状态
*/
@PostMapping("/order/updateOrderStatus")
- public R<Void> updateOrderStatus(@RequestBody Order order);
+ 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);
+ R<Void> subscribe(@RequestParam(value = "id", required = false) Long id, @RequestParam(value = "technicianId", required = false) Integer technicianId);
- /**
- * 预约技师
- */
- @PostMapping("/commission/calculationCommission")
- public R<Void> calculationCommission(@RequestBody Set<String> orderIds);
+
+
+ @GetMapping("/shopping-cart/getGoodsPrice")
+ R<Price> getGoodsPrice(@RequestParam("appUserId") Long appUserId, @RequestParam("goodsId") Integer goodsId, @RequestParam("shopId") Integer shopId);
+ @PostMapping("/order/getLastOrder")
+ R<Order> getLastOrder(@RequestParam("appUserId") Long appUserId);
}
--
Gitblit v1.7.1