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/OrderReturnVO.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/OrderReturnVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
index 46965a2..7ad38e2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import com.ruoyi.common.core.enums.RequestTypeEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
@@ -14,46 +15,76 @@
@ApiModelProperty(value = "售后id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long id;
@ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long orderId;
@ApiModelProperty(value = "申请时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime requestTime;
@ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private RequestTypeEnum requestType;
@ApiModelProperty(value = "申请原因")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String requestReason;
@ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private ReturnRequestStatusEnum status;
@ApiModelProperty(value = "拒绝理由")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String refuseReason;
@ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
@TableLogic
private Integer delFlag;
@ApiModelProperty(value = "详情图，不超过五张图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String album;
@ApiModelProperty(value = "收件人姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String recipientName;
@ApiModelProperty(value = "收件人电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String recipientPhone;
@ApiModelProperty(value = "详细地址")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detailedAddress;
@ApiModelProperty(value = "备注")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String remark;
@ApiModelProperty(value = "快递单号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String courierNumber;
+ @ApiModelProperty("发货快递")
+ private String logisticsNum;
+
+ @ApiModelProperty("退货时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private LocalDateTime returnTime;
+
+ @ApiModelProperty("平台收货时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private LocalDateTime platformReceiptTime;
+
+
+ @ApiModelProperty("审核时间（平台确认时间）")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private LocalDateTime auditTime;
+
}
--
Gitblit v1.7.1