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 | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 21544b0..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
@@ -33,12 +33,16 @@
private Long orderId;
@TableField(exist = false)
- @ApiModelProperty(value = "用户角色")
+ @ApiModelProperty(value = "商品")
private Set<OrderProductSnapshot> productSnapshots;
@NotBlank
@ApiModelProperty(value = "订单号")
private String orderNum;
+
+ @NotBlank
+ @ApiModelProperty(value = "取单号")
+ private String orderStoreNum;
@NotNull
@ApiModelProperty(value = "订单状态")
@@ -48,12 +52,29 @@
@ApiModelProperty(value = "订单状态描述")
private String orderStatusDescribe;
- @ApiModelProperty(value = "订单状态描述")
+ @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")
@@ -74,6 +95,18 @@
@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 = "描述")
@@ -139,14 +172,14 @@
if (o == null || getClass() != o.getClass()) {
return false;
}
- Order user = (Order) o;
- return Objects.equals(orderId, user.orderId) &&
- Objects.equals(orderNum, user.orderNum);
+ Order order = (Order) o;
+ return Objects.equals(orderId, order.orderId) &&
+ Objects.equals(orderNum, order.orderNum);
}
@Override
public int hashCode() {
- return Objects.hash(orderId, username);
+ return Objects.hash(orderId, orderNum);
}
public void copy(Order source){
--
Gitblit v1.9.3