From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 7c7f87a..2db5e11 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
@@ -46,11 +46,11 @@
@ApiModelProperty(value = "下单时间")
private LocalDateTime orderTime;
- @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+ @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单 5=团购订单")
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=已取消")
+ @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消 6=售后中")
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
@@ -105,7 +105,6 @@
@TableLogic
private Integer delFlag;
-
@ApiModelProperty(value = "快递单号")
private String courierNumber;
@@ -113,15 +112,13 @@
private String receiverName;
@ApiModelProperty(value = "收货人电话")
- private String receiverphone;
+ private String receiverPhone;
@ApiModelProperty(value = "城市")
private String receiverCity;
-
@ApiModelProperty(value = "详细地址")
private String receiverDetailAddress;
-
@ApiModelProperty(value = "保证金")
private BigDecimal bound;
@@ -135,5 +132,39 @@
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
+ @ApiModelProperty(value = "商品名称")
+ private String skuName;
+
+ @ApiModelProperty(value = "封面图")
+ private String coverPic;
+
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "积分")
+ private Integer points;
+
+ @ApiModelProperty("发货快递")
+ private String logisticsNum;
+
+ @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;
+
+ @ApiModelProperty("普通商品id")
+ private Long goodsId;
}
--
Gitblit v1.7.1