From 48c56a8b6be6183d220f46d417fdeb98521f0c20 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 20:51:59 +0800
Subject: [PATCH] 修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 41f8d17..b61064e 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
@@ -23,44 +23,44 @@
* 查询指定商品订单
*/
@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")
- public R<List<Order>> byUserId(@RequestParam("appUserId")Long appUserId);
+ R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId);
+ @PostMapping("/order/byShopId")
+ R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId);
+ @PostMapping("/order/byShopIdAndUserId")
+ R<List<Order>> byShopIdAndUserId(@RequestParam("appUserId") Long appUserId,@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")
- public R<Price> getGoodsPrice(@RequestParam("appUserId") Long appUserId, @RequestParam("goodsId") Integer goodsId, @RequestParam("shopId") Integer shopId);
+ 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);
+ R<Order> getLastOrder(@RequestParam("appUserId") Long appUserId);
}
--
Gitblit v1.7.1