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 | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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..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
@@ -8,6 +8,7 @@
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.BondReturnDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
@@ -44,6 +45,10 @@
@PostMapping("/order/getOrderOne1")
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);
@@ -85,8 +90,20 @@
R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/order/getOrderByGroupPurchaseMemberId1")
+ 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")
@@ -113,6 +130,10 @@
@PostMapping("/pay/refund-batch")
R<Map<String, Object>> refund(@RequestBody List<RefundDTO> refundDTOS,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/pay/refund-batch1")
+ R refund1(@RequestBody RefundDTO refundDTOS,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
* 查询保证金订单列表
@@ -154,8 +175,8 @@
/**
* 根据优惠券id集合查询订单列表
*
- * @param couponIdSet 优惠券id集合
- * @param inner 内部调用标志
+ * @param couponIds 优惠券id集合
+ * @param source 内部调用标志
* @return List<Order>
*/
@PostMapping("/order/list-by-coupon")
@@ -168,7 +189,27 @@
* @param id 拍卖商品id
* @param source 内部调用标志
*/
- @GetMapping("/order-auction-bond/refund-bond/{id}")
- R<?> returnBondByAuctionGoodsId(@PathVariable("id") Long id,
+ @GetMapping("/order-auction-bond/refund-bond")
+ R<?> returnBondByAuctionGoodsId(@RequestBody BondReturnDTO bondReturnDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PutMapping("/order/autoCancelOrder/{id}")
+ R<?> autoCancelOrder(@PathVariable("id") Long id,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order/getOrderListByMubres")
+ R<List<Order>> getOrderListByMubres(@RequestBody List<String> mubres,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @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