From f44e4d609e7efaed9eac545137970b1e334f8106 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 21 九月 2024 09:01:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java | 94 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 93 insertions(+), 1 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 104cb54..e8267c3 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,41 +1,133 @@
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 java.math.BigDecimal;
+import java.time.LocalDateTime;
import lombok.Data;
-import java.math.BigDecimal;
@Data
public class MemberOrderListVO {
@ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long id;
@ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String orderNo;
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "会员id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long memberId;
@ApiModelProperty(value = "支付合计")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal totalAmount;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "商品数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer goodsQuantity;
@ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消, 6售后订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderFromEnum orderFrom;
+
+ @ApiModelProperty(value = "下单时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private LocalDateTime orderTime;
+
+ @ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "是否退保证金 1没有退，2 已退")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer isAuctionBond;
+
+ @ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private ReturnRequestStatusEnum status;
+
+ @ApiModelProperty(value = "是否售后")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer isRequest;
+
+ @ApiModelProperty(value = "售后订单")
+ @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