From 82de609c0b76d37d1a5044a631ddc1577374cdfa Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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 cf2fc54..a83ceaf 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,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
@@ -12,46 +13,76 @@
@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;
+
+
}
--
Gitblit v1.7.1