From c2931dfdb47b766ea117f711913d4993c818dd6d Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期六, 15 六月 2024 15:50:47 +0800 Subject: [PATCH] 提交【管理后台】订单管理-售后管理相关接口 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/dto/MgtOrderQuery.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/dto/MgtMallOrderQuery.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/dto/MgtOrderQuery.java similarity index 76% rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/dto/MgtMallOrderQuery.java rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/dto/MgtOrderQuery.java index 01f2193..93a77b3 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/dto/MgtMallOrderQuery.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/dto/MgtOrderQuery.java @@ -2,9 +2,11 @@ import com.ruoyi.common.core.enums.OrderFromEnum; import com.ruoyi.common.core.enums.OrderStatusEnum; +import com.ruoyi.common.core.enums.OrderTypeEnum; import com.ruoyi.common.core.web.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,8 +16,8 @@ */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "商城订单查询对象") -public class MgtMallOrderQuery extends BasePage { +@ApiModel(value = "订单查询对象") +public class MgtOrderQuery extends BasePage { private static final long serialVersionUID = 7466073766154410614L; @@ -36,4 +38,8 @@ @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消,6 售后") private OrderStatusEnum orderStatus; + + @ApiModelProperty(value = "订单类型 1=商城订单 2=拍卖订单") + @NotNull(message = "订单类型不能为空") + private OrderTypeEnum queryType; } -- Gitblit v1.7.1