From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java | 21 ++++++++++++---------
1 files changed, 12 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..18a9ec0 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,8 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* @author zhibing.pu
@@ -16,16 +18,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 +40,12 @@
@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;
+ List<Long> appUserIds;
}
--
Gitblit v1.7.1