From 23cd5d3ce1d855d06c4a6a295149c6cf5d6255ae Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 27 七月 2024 20:06:29 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
index 3ac0ddf..d44a34b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
@@ -50,7 +50,7 @@
private OrderFromEnum orderFrom;
@ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
- private AuctionOrderTypeEnum auctionType;
+ private AuctionOrderTypeEnum auctionOrderType;
@ApiModelProperty(value = "会员id")
private Long memberId;
@@ -61,7 +61,7 @@
@ApiModelProperty(value = "支付合计")
private BigDecimal totalAmount;
- @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消 6=售后中 7=已退款 8=已退款退货")
+ @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消 6=售后中")
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
@@ -149,5 +149,19 @@
@ApiModelProperty(value = "实际商品价格")
private BigDecimal sjPrice;
+
+ @ApiModelProperty("拍卖会id")
+ private Long auctionSalesroomId;
+ @ApiModelProperty("是否显示订单 1显示，2 不显示")
+ private Integer isOrder;
+
+ @ApiModelProperty("是否售后 0未售后，1 售后")
+ private Integer isRequest;
+
+ @ApiModelProperty("失效时间")
+ private LocalDateTime orderTimeSx;
+
+ @ApiModelProperty("团购编号")
+ private String groupNo;
}
--
Gitblit v1.7.1