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 | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 111 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 7ce3c03..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
@@ -3,21 +3,32 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
+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.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;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(contextId = "orderClient", value = ServiceNameConstants.RUOYI_ORDER, fallbackFactory = OrderFallbackFactory.class)
public interface OrderClient {
@@ -25,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")
@@ -61,11 +81,98 @@
R<List<Order>> getOrderByGroupPurchaseId(@PathVariable("id") Long id,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
- @PostMapping("/order-auction-bond/getOrderAuctionBondList")
- R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO,
- @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/order/getOrderByGroupPurchaseMemberId")
+ R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
- @PostMapping("/inner/pay/refund-batch")
+ @PostMapping("/order/getOrderByGroupPurchaseMemberList")
+ R<List<OrderVO>> getOrderByGroupPurchaseMemberList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order-auction-bond/getOrderAuctionBondList1")
+ R<List<OrderAuctionBond>> getOrderAuctionBondList1(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order-auction-bond/getAuctionGoodsOrderAuctionBondList")
+ R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/order-auction-bond/getOrderAuctionBondone")
+ R<OrderAuctionBond> getOrderAuctionBondone(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order-auction-bond/getOrderAuctionBondone1")
+ R<OrderAuctionBond> getOrderAuctionBondone1(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 批量退款
+ *
+ * @param refundDTOS 退款数据传输对象
+ * @param source 内部调用标志
+ * @return Map<String, Object>
+ */
+ @PostMapping("/pay/refund-batch")
R<Map<String, Object>> refund(@RequestBody List<RefundDTO> refundDTOS,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 查询保证金订单列表
+ *
+ * @param id 拍卖商品id
+ * @param auctionOrderTypeEnum 拍卖类型： 普通拍品 拍卖会拍品
+ * @param bondStatusEnum 保证金状态 待支付 已支付 已退款 为null则查询所有
+ * @param source 内部调用标志
+ * @return List<OrderAuctionBond>
+ */
+ @PostMapping("/order-auction-bond/list")
+ R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestParam("id") Long id,
+ @RequestParam("auctionOrderTypeEnum") AuctionOrderTypeEnum auctionOrderTypeEnum,
+ @RequestParam(value = "bondStatusEnum", required = false) BondStatusEnum bondStatusEnum,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * @param ids 保证金订单id列表
+ * @param bondStatusEnum 保证金状态
+ */
+ @PutMapping("/order-auction-bond/updateOrderAuctionBondStatus")
+ R<?> updateOrderAuctionBondStatus(@RequestParam("ids") List<Long> ids,
+ @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 批量更新订单状态
+ *
+ * @param orderUpdDTOS 订单更新数据传输对象列表
+ * @param source 内部调用标志
+ */
+ @PutMapping("/order/upd-batch")
+ R<?> updateOrderList(@RequestBody List<OrderUpdDTO> orderUpdDTOS,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/order-auction-bond/SaveOrderAuctionBond")
+ R<PayInfoVO> SaveOrderAuctionBond(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 根据优惠券id集合查询订单列表
+ *
+ * @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