From 855921d253a4854d4fb78b83bfcf7c6e93b3f68d Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 29 五月 2024 19:43:50 +0800 Subject: [PATCH] 1.提交【管理后台】团购、拍卖商品立即结束退款处理 2.提交【管理后台】拍卖场管理部分接口 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 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..0733bcc 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,11 +3,14 @@ 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.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.factory.OrderFallbackFactory; import java.util.List; @@ -16,8 +19,10 @@ 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 { @@ -65,7 +70,47 @@ R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - @PostMapping("/inner/pay/refund-batch") + /** + * 批量退款 + * + * @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") + R<?> updateOrderAuctionBondStatus(@RequestParam("ids") List<Long> ids, + @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum); + + /** + * 批量更新订单状态 + * + * @param orderUpdDTOS 订单更新数据传输对象列表 + * @param source 内部调用标志 + */ + @PutMapping("/order/upd-batch") + R<?> updateOrderList(@RequestBody List<OrderUpdDTO> orderUpdDTOS, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } -- Gitblit v1.7.1