From 138e3641fbe49a114a399323aa145774f310627e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 11 Jul 2025 18:06:31 +0800
Subject: [PATCH] 订单信息优化
---
oying-system/src/main/java/com/oying/modules/sh/domain/Order.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/Order.java b/oying-system/src/main/java/com/oying/modules/sh/domain/Order.java
index d1893bd..21544b0 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/Order.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/Order.java
@@ -1,5 +1,6 @@
package com.oying.modules.sh.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.oying.base.BaseEntity;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,9 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.util.Objects;
+import java.util.Set;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -28,6 +32,10 @@
@ApiModelProperty(value = "主键")
private Long orderId;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "用户角色")
+ private Set<OrderProductSnapshot> productSnapshots;
+
@NotBlank
@ApiModelProperty(value = "订单号")
private String orderNum;
@@ -39,6 +47,13 @@
@NotBlank
@ApiModelProperty(value = "订单状态描述")
private String orderStatusDescribe;
+
+ @ApiModelProperty(value = "订单状态描述")
+ private String orderRemark;
+
+ @NotBlank
+ @ApiModelProperty(value = "预计送达时间")
+ private String orderTime;
@NotNull
@ApiModelProperty(value = "用户id")
@@ -116,6 +131,24 @@
@ApiModelProperty(value = "签名")
private String paySign;
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ Order user = (Order) o;
+ return Objects.equals(orderId, user.orderId) &&
+ Objects.equals(orderNum, user.orderNum);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(orderId, username);
+ }
+
public void copy(Order source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
--
Gitblit v1.9.3