From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 8fc6565..7e841dd 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
@@ -47,6 +47,10 @@
R<Order> getOrderOne1(@RequestBody OrderDTO orderDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/order/getOrderOne2")
+ R<Order> getOrderOne2(@RequestBody OrderDTO orderDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
@PostMapping("/order-auction-bond/getOrderAuctionBond")
R<Boolean> getOrderAuctionBond(@RequestBody OrderAuctionBondDTO orderAuctionBondDTO,
@@ -90,8 +94,16 @@
R<Order> getOrderByGroupPurchaseMemberId1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/order/getOrderByGroupPurchaseMemberId2")
+ R<Order> getOrderByGroupPurchaseMemberId2(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
@PostMapping("/order/getOrderByGroupPurchaseMemberList")
R<List<OrderVO>> getOrderByGroupPurchaseMemberList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order/getOrderByGroupPurchaseMemberList1")
+ R<List<OrderVO>> getOrderByGroupPurchaseMemberList1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/order-auction-bond/getOrderAuctionBondList1")
@@ -192,4 +204,12 @@
@PostMapping("/order/updOrderStatusByMubres")
R<?> updateOrderStatusByMubres(@RequestBody List<String> formedGroupMubres,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order/updOrderStatusByMubres1")
+ R<?> updateOrderStatusByMubres1(@RequestBody String formedGroupMubres,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order/updOrderStatusByMubres2")
+ R<List<Order>> updateOrderStatusByMubres2(@RequestBody String formedGroupMubres,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}
--
Gitblit v1.7.1