From 47378fb7743a8e139d0ee2de8f35eb41ba7bda06 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 25 Sep 2025 21:49:54 +0800
Subject: [PATCH] 汇旺财多账户支付配置

---
 oying-system/src/main/java/com/oying/modules/sh/domain/Order.java |   22 +++++++++++++++++++++-
 1 files changed, 21 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 1f33c2a..93dd1ee 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
@@ -9,6 +9,7 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.util.Objects;
 import java.util.Set;
 
@@ -56,8 +57,15 @@
     private String orderRemark;
 
     @NotBlank
-    @ApiModelProperty(value = "预计送达时间")
+    @ApiModelProperty(value = "送达预计时间")
     private String orderTime;
+
+    @ApiModelProperty(value = "送达完成时间")
+    private Timestamp orderFinishTime;
+
+    @NotNull
+    @ApiModelProperty(value = "打包费")
+    private BigDecimal packagingPrice;
 
     @NotNull
     @ApiModelProperty(value = "配送费")
@@ -97,6 +105,18 @@
     private String storeLogo;
 
     @NotBlank
+    @ApiModelProperty(value = "门店详细地址")
+    private String storeAddress;
+
+    @NotNull
+    @ApiModelProperty(value = "门店经度")
+    private BigDecimal storeLongitude;
+
+    @NotNull
+    @ApiModelProperty(value = "门店纬度")
+    private BigDecimal storeLatitude;
+
+    @NotBlank
     @ApiModelProperty(value = "描述")
     private String orderDescribe;
 

--
Gitblit v1.9.3