From c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:58:12 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 b6cdfb0..7e4070c 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
@@ -19,6 +19,8 @@
private String code;
@ApiModelProperty("下单时间")
private String createTime;
+ @ApiModelProperty("售后截止时间")
+ private String afterSaleTime;
@ApiModelProperty("下单用户")
private String userName;
@ApiModelProperty("联系电话")
@@ -29,12 +31,24 @@
private Integer paymentType;
@ApiModelProperty("订单金额")
private BigDecimal orderMoney;
+ @ApiModelProperty("订单积分")
+ private BigDecimal point;
@ApiModelProperty("订单状态（1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价）")
private Integer status;
+ @ApiModelProperty("配送方式（1=自提，2=快递）")
+ private Integer distributionMode;
+ @ApiModelProperty("获得分佣")
+ private BigDecimal getCommission;
/**
* 用户id
*/
private Long appUserId;
@ApiModelProperty("售后订单id")
private String refundPassId;
+
+ private Integer shopId;
+
+ public BigDecimal getGetPoint(){
+ return point;
+ }
}
--
Gitblit v1.7.1