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 | 8 +++-----
1 files changed, 3 insertions(+), 5 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..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
@@ -33,6 +33,8 @@
@PostMapping("/order/byUserId")
public R<List<Order>> byUserId(@RequestParam("appUserId")Long appUserId);
+ @PostMapping("/order/byShopId")
+ public R<List<Order>> byShopId(@RequestParam("shopId")Integer shopId);
/**
@@ -53,11 +55,7 @@
@PostMapping("/order/subscribe")
public 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);
--
Gitblit v1.7.1