From cd55aff7eea06f77a8f712cef1ad2744c44d0f8a Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 20 六月 2024 18:56:16 +0800 Subject: [PATCH] 1.修改bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 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 1d3cfd7..4510123 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") @@ -117,9 +133,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); /** * 批量更新订单状态 @@ -145,4 +161,14 @@ @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); } -- Gitblit v1.7.1