From 2eb4e3b8ca10cc860fe0681f9737803cfb145e25 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 16 七月 2024 16:55:47 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 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 b2ac6fa..49ccaf2 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
@@ -7,7 +7,14 @@
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
-import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
+import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
+import com.ruoyi.system.api.domain.dto.OrderDTO;
+import com.ruoyi.system.api.domain.dto.OrderUpdDTO;
+import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.factory.OrderFallbackFactory;
@@ -29,6 +36,15 @@
@PostMapping("/order/saveOrderOne")
R<Boolean> saveOrderOne(@RequestBody OrderDTO orderDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+ @PostMapping("/order/getOrderOne")
+ R<Order> getOrderOne(@RequestBody OrderDTO orderDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order/getOrderOne1")
+ R<Order> getOrderOne1(@RequestBody OrderDTO orderDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/order-auction-bond/getOrderAuctionBond")
@@ -68,6 +84,10 @@
@PostMapping("/order/getOrderByGroupPurchaseMemberId")
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/getOrderByGroupPurchaseMemberList")
R<List<OrderVO>> getOrderByGroupPurchaseMemberList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
@@ -138,11 +158,25 @@
/**
* 根据优惠券id集合查询订单列表
*
- * @param couponIdSet 优惠券id集合
- * @param inner 内部调用标志
+ * @param couponIds 优惠券id集合
+ * @param source 内部调用标志
* @return List<Order>
*/
@PostMapping("/order/list-by-coupon")
R<List<Order>> getOrderByCouponIds(@RequestBody Collection<Long> couponIds,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 拍卖商品退保证金
+ *
+ * @param id 拍卖商品id
+ * @param source 内部调用标志
+ */
+ @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