From 6e00a7394e691883295799dd45f509e8ac57c58d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 09:35:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
index a6bfc35..9f41e2c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
@@ -16,6 +16,8 @@
public class OrderInfoVo {
@ApiModelProperty("订单id")
private String id;
+ @ApiModelProperty("售后订单id")
+ private String refundPassId;
@ApiModelProperty("订单编号")
private String orderNumber;
@ApiModelProperty("下单时间")
@@ -34,6 +36,8 @@
private Integer paymentMethod;
@ApiModelProperty("订单总金额")
private BigDecimal totalAmount;
+ @ApiModelProperty("支付积分")
+ private Integer point;
@ApiModelProperty("优惠券")
private String couponName;
@ApiModelProperty("抵扣金额")
@@ -43,7 +47,7 @@
@ApiModelProperty("支付金额")
private BigDecimal paymentAmount;
@ApiModelProperty("获得积分")
- private Integer point;
+ private Integer getPoint;
@ApiModelProperty("收件人")
private String recipient;
@ApiModelProperty("收件地址")
@@ -58,7 +62,13 @@
private String writeOffTime;
@ApiModelProperty("服务技师")
private String technicianName;
+ @ApiModelProperty("核销人")
+ private String canceller;
@ApiModelProperty("分佣金额")
private BigDecimal subcommission;
+ @ApiModelProperty("售后截止时间")
+ private String afterSaleTime;
+ @ApiModelProperty("活动名称")
+ private String activityName;
}
--
Gitblit v1.7.1