From 5ca83caaff7554241a01e483f1305241910b9048 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Wed, 20 May 2026 11:42:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BuyerOrderController.java | 7 +++++- .../module/order/dto/BuyerOrdersDTO.java | 25 +++++++++++++++++++ .../module/order/feign/OrderFeignClient.java | 8 ++---- .../order/service/IBuyerOrderService.java | 3 ++- .../service/impl/BuyerOrderServiceImpl.java | 7 +++--- 5 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/aida/buyer/module/order/dto/BuyerOrdersDTO.java diff --git a/src/main/java/com/aida/buyer/module/order/controller/BuyerOrderController.java b/src/main/java/com/aida/buyer/module/order/controller/BuyerOrderController.java index 5317a63..2567e71 100644 --- a/src/main/java/com/aida/buyer/module/order/controller/BuyerOrderController.java +++ b/src/main/java/com/aida/buyer/module/order/controller/BuyerOrderController.java @@ -2,6 +2,7 @@ package com.aida.buyer.module.order.controller; import com.aida.buyer.common.result.PageResponse; import com.aida.buyer.common.result.Response; +import com.aida.buyer.module.order.dto.BuyerOrdersDTO; import com.aida.buyer.module.order.service.IBuyerOrderService; import com.aida.buyer.module.order.vo.BuyerOrderVO; import io.swagger.v3.oas.annotations.Operation; @@ -30,7 +31,11 @@ public class BuyerOrderController { @RequestParam(defaultValue = "1") long page, @RequestParam(defaultValue = "10") long size, @RequestParam(required = false) Integer status) { - return buyerOrderService.getMyOrders(page, size, status); + BuyerOrdersDTO dto = new BuyerOrdersDTO(); + dto.setPage(page); + dto.setSize(size); + dto.setStatus(status); + return buyerOrderService.getMyOrders(dto); } @PostMapping("/create") diff --git a/src/main/java/com/aida/buyer/module/order/dto/BuyerOrdersDTO.java b/src/main/java/com/aida/buyer/module/order/dto/BuyerOrdersDTO.java new file mode 100644 index 0000000..79ac544 --- /dev/null +++ b/src/main/java/com/aida/buyer/module/order/dto/BuyerOrdersDTO.java @@ -0,0 +1,25 @@ +package com.aida.buyer.module.order.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; + +@Data +@Schema(description = "根据买家ID查询订单列表请求参数") +public class BuyerOrdersDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(description = "买家ID") + private Long buyerId; + + @Schema(description = "页码，默认1") + private long page = 1; + + @Schema(description = "每页数量，默认10") + private long size = 10; + + @Schema(description = "订单状态：0-未支付，1-已支付，2-已取消") + private Integer status; +} diff --git a/src/main/java/com/aida/buyer/module/order/feign/OrderFeignClient.java b/src/main/java/com/aida/buyer/module/order/feign/OrderFeignClient.java index 4faa044..755e106 100644 --- a/src/main/java/com/aida/buyer/module/order/feign/OrderFeignClient.java +++ b/src/main/java/com/aida/buyer/module/order/feign/OrderFeignClient.java @@ -3,6 +3,7 @@ package com.aida.buyer.module.order.feign; import com.aida.buyer.common.result.PageResponse; import com.aida.buyer.common.result.Response; import com.aida.buyer.module.feign.annotation.InternalCall; +import com.aida.buyer.module.order.dto.BuyerOrdersDTO; import com.aida.buyer.module.order.dto.CreateOrderDTO; import com.aida.buyer.module.order.vo.BuyerOrderVO; import com.aida.buyer.module.order.vo.CreateOrderResultVO; @@ -15,7 +16,6 @@ import org.springframework.web.bind.annotation.GetMapping; 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.RequestParam; /** * 订单服务 Feign Client @@ -24,11 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam; public interface OrderFeignClient { @PostMapping("/buyer/orders") - Response> getOrdersByBuyerId( - @RequestParam Long buyerId, - @RequestParam(defaultValue = "1") long page, - @RequestParam(defaultValue = "10") long size, - @RequestParam(required = false) Integer status); + Response> getOrdersByBuyerId(@RequestBody BuyerOrdersDTO dto); @PostMapping("/create") Response createOrder(@RequestBody CreateOrderDTO dto); diff --git a/src/main/java/com/aida/buyer/module/order/service/IBuyerOrderService.java b/src/main/java/com/aida/buyer/module/order/service/IBuyerOrderService.java index 146ce9d..0fafa41 100644 --- a/src/main/java/com/aida/buyer/module/order/service/IBuyerOrderService.java +++ b/src/main/java/com/aida/buyer/module/order/service/IBuyerOrderService.java @@ -2,13 +2,14 @@ package com.aida.buyer.module.order.service; import com.aida.buyer.common.result.PageResponse; import com.aida.buyer.common.result.Response; +import com.aida.buyer.module.order.dto.BuyerOrdersDTO; import com.aida.buyer.module.order.vo.BuyerOrderVO; import java.util.List; public interface IBuyerOrderService { - Response> getMyOrders(long page, long size, Integer status); + Response> getMyOrders(BuyerOrdersDTO dto); Response createOrder(List listingIds); } diff --git a/src/main/java/com/aida/buyer/module/order/service/impl/BuyerOrderServiceImpl.java b/src/main/java/com/aida/buyer/module/order/service/impl/BuyerOrderServiceImpl.java index 5e40b08..81966aa 100644 --- a/src/main/java/com/aida/buyer/module/order/service/impl/BuyerOrderServiceImpl.java +++ b/src/main/java/com/aida/buyer/module/order/service/impl/BuyerOrderServiceImpl.java @@ -6,6 +6,7 @@ import com.aida.buyer.common.result.PageResponse; import com.aida.buyer.common.result.Response; import com.aida.buyer.module.account.entity.BuyerAccount; import com.aida.buyer.module.account.mapper.BuyerAccountMapper; +import com.aida.buyer.module.order.dto.BuyerOrdersDTO; import com.aida.buyer.module.order.dto.CreateOrderDTO; import com.aida.buyer.module.order.feign.OrderFeignClient; import com.aida.buyer.module.order.service.IBuyerOrderService; @@ -24,9 +25,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { private final BuyerAccountMapper buyerAccountMapper; @Override - public Response> getMyOrders(long page, long size, Integer status) { - Long buyerId = UserContext.getBuyerId(); - return orderFeignClient.getOrdersByBuyerId(buyerId, page, size, status); + public Response> getMyOrders(BuyerOrdersDTO dto) { + dto.setBuyerId(UserContext.getBuyerId()); + return orderFeignClient.getOrdersByBuyerId(dto); } @Override