From c9c65a2277d91c0745221b8c631e704debfe6750 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 18:37:57 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
index 00241e4..5186b62 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
@@ -1,14 +1,15 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import lombok.Data;
@Data
public class MemberOrderListVO {
@@ -49,7 +50,7 @@
private OrderStatusEnum orderStatus;
- @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+ @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单 5=心愿求购")
@JsonInclude(JsonInclude.Include.ALWAYS)
private OrderFromEnum orderFrom;
@@ -77,5 +78,56 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private Long requestId;
+ @ApiModelProperty(value = "快递单号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String courierNumber;
+ @ApiModelProperty("发货快递")
+ private String logisticsNum;
+
+
+ @ApiModelProperty(value = "收货人姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String receiverName;
+
+ @ApiModelProperty(value = "收货人电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String receiverPhone;
+
+ @ApiModelProperty(value = "城市")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String receiverCity;
+
+
+ @ApiModelProperty(value = "详细地址")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String receiverDetailAddress;
+
+ @ApiModelProperty(value = "订单说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String orderShuoMin;
+
+ @ApiModelProperty(value = "订单退货周期")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer orderZq;
+
+ @ApiModelProperty(value = "确认收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private LocalDateTime receiveTime;
+
+ @ApiModelProperty(value = "单位")
+ private String unit;
+
+ @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
+ private AuctionOrderTypeEnum auctionOrderType;
+
+ @ApiModelProperty(value = "规格")
+ private String spec;
+
+ @ApiModelProperty(value = "规格单位")
+ private String specUnit;
+
+ @ApiModelProperty("普通商品id")
+ private Long goodsId;
}
--
Gitblit v1.7.1