From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/sh/domain/Order.java |   88 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 87 insertions(+), 1 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 1655629..c899502 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,17 +32,81 @@
     @ApiModelProperty(value = "主键")
     private Long orderId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商品")
+    private Set<OrderProductSnapshot> productSnapshots;
+
     @NotBlank
     @ApiModelProperty(value = "订单号")
     private String orderNum;
+
+    @NotBlank
+    @ApiModelProperty(value = "取单号")
+    private String orderStoreNum;
+
+    @NotNull
+    @ApiModelProperty(value = "订单状态")
+    private Integer orderStatus = 0;
+
+    @NotBlank
+    @ApiModelProperty(value = "订单状态描述")
+    private String orderStatusDescribe;
+
+    @ApiModelProperty(value = "订单备注")
+    private String orderRemark;
+
+    @NotBlank
+    @ApiModelProperty(value = "预计送达时间")
+    private String orderTime;
+
+    @NotNull
+    @ApiModelProperty(value = "配送费")
+    private BigDecimal sendPrice;
+
+    @NotBlank
+    @ApiModelProperty(value = "配送类型")
+    private String sendType;
+
+    @ApiModelProperty(value = "骑手Id")
+    private Long riderId;
+
+    @ApiModelProperty(value = "骑手手机号")
+    private String riderPhone;
+
+    @ApiModelProperty(value = "骑手名称")
+    private String riderName;
 
     @NotNull
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
+    @NotBlank
+    @ApiModelProperty(value = "用户账号")
+    private String username;
+
     @NotNull
     @ApiModelProperty(value = "门店ID")
     private Long storeId;
+
+    @NotBlank
+    @ApiModelProperty(value = "门店名称")
+    private String storeName;
+
+    @NotBlank
+    @ApiModelProperty(value = "门店LOGO")
+    private String storeLogo;
+
+    @NotBlank
+    @ApiModelProperty(value = "门店详细地址")
+    private String storeAddress;
+
+    @NotNull
+    @ApiModelProperty(value = "门店经度")
+    private BigDecimal storeLongitude;
+
+    @NotNull
+    @ApiModelProperty(value = "门店纬度")
+    private BigDecimal storeLatitude;
 
     @NotBlank
     @ApiModelProperty(value = "描述")
@@ -71,7 +139,7 @@
     private String payTime;
 
     @NotBlank
-    @ApiModelProperty(value = "订单失效时间RFC3339")
+    @ApiModelProperty(value = "订单失效时间")
     private String expireTime;
 
     @NotBlank
@@ -96,6 +164,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 order = (Order) o;
+        return Objects.equals(orderId, order.orderId) &&
+                Objects.equals(orderNum, order.orderNum);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, orderNum);
+    }
+
     public void copy(Order source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

--
Gitblit v1.9.3