From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 52 ++++++++++------------------------------------------
1 files changed, 10 insertions(+), 42 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
index 764513a..00e42f4 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.order.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,22 +19,10 @@
private Integer orderStatus;
@ApiModelProperty(value = "订单商品")
- private List<OrderGoodsVO> goodsList;
+ private OrderGoodsVO orderGoodsVO;
@ApiModelProperty(value = "使用积分")
private Integer point;
-
- @ApiModelProperty(value = "收货地址id")
- private Long addressId;
-
- @ApiModelProperty(value = "收货联系人")
- private String recieveName;
-
- @ApiModelProperty(value = "收货联系电话")
- private String recievePhone;
-
- @ApiModelProperty(value = "收货地址")
- private String recieveAddress;
@ApiModelProperty(value = "订单编号")
private String orderNumber;
@@ -44,26 +33,11 @@
@ApiModelProperty(value = "订单总金额")
private BigDecimal totalAmount;
- @ApiModelProperty(value = "优惠券名称")
- private String couponName;
-
- @ApiModelProperty(value = "参与活动名称")
- private String activityName;
-
- @ApiModelProperty(value = "抵扣金额")
- private BigDecimal couponAmount;
-
- @ApiModelProperty(value = "快递费")
- private BigDecimal expressAmount;
-
- @ApiModelProperty(value = "可获得积分")
- private Integer pointAmount;
+ @ApiModelProperty(value = "积分抵扣金额")
+ private BigDecimal pointDeductionAmount;
@ApiModelProperty(value = "实际支付价格")
private BigDecimal paymentAmount;
-
- @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
- private Integer distributionMode;
@ApiModelProperty(value = "门店名称")
private String shopName;
@@ -79,20 +53,14 @@
@ApiModelProperty(value = "门店id")
private Integer shopId;
-
- @ApiModelProperty(value = "技师名称")
- private String technicianName;
-
- @ApiModelProperty(value = "技师id")
- private Integer technicianId;
-
- @ApiModelProperty(value = "预约单id")
- private String technicianSubscribeId;
+ @ApiModelProperty(value = "评价id")
+ private Long evaluateId;
@ApiModelProperty("核销码BASE64")
private String writeOffCode;
-
- @ApiModelProperty("最新快递信息")
- private String express;
+
+ @ApiModelProperty(value = "核销时间")
+ @TableField("end_time")
+ private LocalDateTime endTime;
}
--
Gitblit v1.7.1