From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 78 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 5 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 ed131cb..2fde7c8 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,6 +7,8 @@
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.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;
@@ -14,6 +16,7 @@
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.MgtPromotionWishRecommendVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.factory.OrderFallbackFactory;
@@ -33,8 +36,21 @@
public interface OrderClient {
@PostMapping("/order/saveOrderOne")
- R<Boolean> saveOrderOne(@RequestBody OrderDTO orderDTO,
+ R<Long> 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/getOrderOne2")
+ R<Order> getOrderOne2(@RequestBody OrderDTO orderDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/order-auction-bond/getOrderAuctionBond")
@@ -75,14 +91,28 @@
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")
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);
@@ -101,6 +131,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);
/**
* 查询保证金订单列表
@@ -121,9 +155,9 @@
* @param ids 保证金订单id列表
* @param bondStatusEnum 保证金状态
*/
- @PutMapping("/order-auction-bond")
+ @PutMapping("/order-auction-bond/updateOrderAuctionBondStatus")
R<?> updateOrderAuctionBondStatus(@RequestParam("ids") List<Long> ids,
- @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum);
+ @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
* 批量更新订单状态
@@ -142,11 +176,45 @@
/**
* 根据优惠券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")
+ 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);
+
+ @GetMapping("/order/getWishDataBySkuId/{id}")
+ R<MgtPromotionWishRecommendVO> getWishDataBySkuId(@PathVariable("id") Long id,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}
--
Gitblit v1.7.1