From 82de609c0b76d37d1a5044a631ddc1577374cdfa Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
index 4510123..4882d3e 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
@@ -154,8 +154,8 @@
/**
* 根据优惠券id集合查询订单列表
*
- * @param couponIdSet 优惠券id集合
- * @param inner 内部调用标志
+ * @param couponIds 优惠券id集合
+ * @param source 内部调用标志
* @return List<Order>
*/
@PostMapping("/order/list-by-coupon")
@@ -171,4 +171,8 @@
@GetMapping("/order-auction-bond/refund-bond/{id}")
R<?> returnBondByAuctionGoodsId(@PathVariable("id") Long id,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PutMapping("/order/autoCancelOrder/{id}")
+ R<?> autoCancelOrder(@PathVariable("id") Long id,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}
--
Gitblit v1.7.1