From 8093bf217b5dbe59a5703b013f3fc79ed0d4fc36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:06:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java | 10 +++++++++-
1 files changed, 9 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..578f8af 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
@@ -34,6 +34,8 @@
private Integer paymentMethod;
@ApiModelProperty("订单总金额")
private BigDecimal totalAmount;
+ @ApiModelProperty("支付积分")
+ private Integer point;
@ApiModelProperty("优惠券")
private String couponName;
@ApiModelProperty("抵扣金额")
@@ -43,7 +45,7 @@
@ApiModelProperty("支付金额")
private BigDecimal paymentAmount;
@ApiModelProperty("获得积分")
- private Integer point;
+ private Integer getPoint;
@ApiModelProperty("收件人")
private String recipient;
@ApiModelProperty("收件地址")
@@ -58,7 +60,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