From 3c57e41dcef44b5d0994ab7c6edc12ec4c289803 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 14 六月 2024 19:04:09 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
index ef9c13a..f501fcb 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
@@ -1,10 +1,8 @@
package com.ruoyi.system.api.domain.vo;
import com.baomidou.mybatisplus.annotation.*;
-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.PaymentMethodEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.enums.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.core.annotation.Order;
@@ -44,9 +42,11 @@
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime payTime;
@ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime cancelTime;
@ApiModelProperty(value = "订单备注")
@@ -56,6 +56,7 @@
private LocalDateTime deliveryTime;
@ApiModelProperty(value = "确认收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime receiveTime;
@ApiModelProperty(value = "优惠金额")
@@ -65,6 +66,7 @@
private Integer goodsQuantity;
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
@@ -80,7 +82,7 @@
private String receiverName;
@ApiModelProperty(value = "收货人电话")
- private String receiverphone;
+ private String receiverPhone;
@ApiModelProperty(value = "城市")
private String receiverCity;
@@ -96,4 +98,35 @@
@ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
private Integer invoiceStatus;
+ @ApiModelProperty(value = "商品名称")
+ private String skuName;
+
+ @ApiModelProperty(value = "封面图")
+ private String coverPic;
+
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+
+
+ @ApiModelProperty(value = "积分")
+ private Integer points;
+
+ @ApiModelProperty(value = "实际商品价格")
+ private BigDecimal sjPrice;
+
+ @ApiModelProperty(value = "成团时间")
+ private LocalDateTime purchase;
+
+ @ApiModelProperty(value = "是否售后")
+ private Integer isRequest;
+
+ @ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
+ private ReturnRequestStatusEnum status;
+
+ @ApiModelProperty(value = "成团时间")
+ private LocalDateTime groupTime;
+
+ @ApiModelProperty(value = "是否退保证金 1没有退，2 已退")
+ private Integer isAuctionBond;
+
}
--
Gitblit v1.7.1