From 19df67e19f23cd2a04d1c7f355e1e656f4140af4 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 17 四月 2025 20:04:14 +0800
Subject: [PATCH] 后台:首页统计、系统管理、广告管理、用户管理、商品分类管理

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
index 3f7d7e1..764af81 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * @author zhibing.pu
@@ -16,16 +17,17 @@
 @ApiModel
 public class OrderPageListVo {
 	@ApiModelProperty("订单id")
-	private String id;
+	private Long id;
+	@ApiModelProperty("订单idStr")
+	private String idStr;
 	@ApiModelProperty("订单编号")
 	@Excel(name = "订单编号")
 	private String orderNumber;
 	@ApiModelProperty("订单状态(3待使用4已完成5已取消6已退款7售后中8已评价)")
 	@Excel(name = "订单状态", readConverterExp = "3=待使用,4=已完成,5=已取消,6=已退款,7=售后中,8=已评价")
 	private Integer orderStatus;
-	@ApiModelProperty("下单时间")
-	@Excel(name = "下单时间")
-	private String createTime;
+	@ApiModelProperty(value = "下单时间")
+	private LocalDateTime createTime;
 	@ApiModelProperty(value = "商品名称(多个名称逗号隔开))")
 	private String goodName;
 	@ApiModelProperty(value = "商品封面(多张逗号隔开,最多三张))")
@@ -37,12 +39,11 @@
 	@ApiModelProperty(value = "用户手机号")
 	private String phone;
 
-	@ApiModelProperty("售后截止时间")
-	private String afterSaleTime;
+	@ApiModelProperty(value = "售后截止日期")
+	private LocalDateTime afterSaleTime;
 
-	@ApiModelProperty("订单金额")
-	@Excel(name = "支付金额")
-	private BigDecimal orderMoney;
+	@ApiModelProperty(value = "实际支付价格")
+	private BigDecimal paymentAmount;
 
 
 }

--
Gitblit v1.7.1