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/OrderInfoVo.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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..88aa5b8 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
@@ -1,5 +1,6 @@
package com.ruoyi.order.vo;
+import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.util.vo.QueryKD100Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -16,6 +17,8 @@
public class OrderInfoVo {
@ApiModelProperty("订单id")
private String id;
+ @ApiModelProperty("售后订单id")
+ private String refundPassId;
@ApiModelProperty("订单编号")
private String orderNumber;
@ApiModelProperty("下单时间")
@@ -34,6 +37,8 @@
private Integer paymentMethod;
@ApiModelProperty("订单总金额")
private BigDecimal totalAmount;
+ @ApiModelProperty("支付积分")
+ private Integer point;
@ApiModelProperty("优惠券")
private String couponName;
@ApiModelProperty("抵扣金额")
@@ -43,13 +48,13 @@
@ApiModelProperty("支付金额")
private BigDecimal paymentAmount;
@ApiModelProperty("获得积分")
- private Integer point;
+ private Integer getPoint;
@ApiModelProperty("收件人")
private String recipient;
@ApiModelProperty("收件地址")
private String address;
@ApiModelProperty("物流信息")
- private QueryKD100Vo express;
+ private MapTrackKD100Vo express;
@ApiModelProperty("商品数量")
private Integer goodsNum;
@ApiModelProperty("商品信息")
@@ -58,7 +63,15 @@
private String writeOffTime;
@ApiModelProperty("服务技师")
private String technicianName;
+ @ApiModelProperty("核销人")
+ private String canceller;
@ApiModelProperty("分佣金额")
private BigDecimal subcommission;
+ @ApiModelProperty("售后截止时间")
+ private String afterSaleTime;
+ @ApiModelProperty("活动名称")
+ private String activityName;
+ @ApiModelProperty("核销码BASE64")
+ private String writeOffCode;
}
--
Gitblit v1.7.1