From 721ce5a595fa0748728cb640d1b408b1a4b9a983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sun, 12 Apr 2026 21:55:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E6=96=B9=E5=BC=8F=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E8=B4=B9=E7=94=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增deliveryMethod字段支持配送方式选择（电梯/步梯/一楼商铺）
- 新增deliveryFloor字段记录步梯送上楼时的楼层
- 新增deliveryFee字段计算并保存配送费用
- 在数据库表glt_ticket_order中增加对应字段及注释说明
- 丰富订单实体GltTicketOrder类以支持新配送信息存储和传输
---
 .workbuddy/expert-history.json                      | 13 ++++++++++++-
 sql/glt_ticket_order_delivery_fields.sql            |  7 +++++++
 .../com/gxwebsoft/glt/entity/GltTicketOrder.java    |  9 +++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 sql/glt_ticket_order_delivery_fields.sql

diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json
index 58cfef1..998ac4a 100644
--- a/.workbuddy/expert-history.json
+++ b/.workbuddy/expert-history.json
@@ -11,7 +11,18 @@
         "usedAt": 1775972794982,
         "industryId": "all"
       }
+    ],
+    "e7c3c15a2556446884e56ce4d588e133": [
+      {
+        "expertId": "SeniorDeveloper",
+        "name": "Will",
+        "profession": "高级开发工程师",
+        "avatarUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/avatars/02-Engineering/SeniorDeveloper/SeniorDeveloper.png",
+        "promptUrl": "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/experts/experts/02-Engineering/SeniorDeveloper/SeniorDeveloper_zh.md",
+        "usedAt": 1776000797914,
+        "industryId": "all"
+      }
     ]
   },
-  "lastUpdated": 1776000634627
+  "lastUpdated": 1776000910040
 }
\ No newline at end of file
diff --git a/sql/glt_ticket_order_delivery_fields.sql b/sql/glt_ticket_order_delivery_fields.sql
new file mode 100644
index 0000000..bbbac31
--- /dev/null
+++ b/sql/glt_ticket_order_delivery_fields.sql
@@ -0,0 +1,7 @@
+-- 配送方式、楼层、配送费字段
+-- 对应需求：送水订单下单时选择配送方式（电梯/步梯/一楼商铺），步梯送上楼需选楼层，配送费 = 数量 × (楼层-1)
+
+ALTER TABLE glt_ticket_order
+    ADD COLUMN delivery_method VARCHAR(32) DEFAULT NULL COMMENT '配送方式：elevator(电梯) / stairs(步梯) / groundFloor(一楼商铺/其他)' AFTER buyer_remarks,
+    ADD COLUMN delivery_floor INT DEFAULT NULL COMMENT '楼层（步梯+送上楼时有值，从2开始）' AFTER delivery_method,
+    ADD COLUMN delivery_fee DECIMAL(10,2) DEFAULT NULL COMMENT '配送费（数量 × (楼层-1)）' AFTER delivery_floor;
diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java
index 17bb743..f1bdc94 100644
--- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java
+++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java
@@ -191,6 +191,15 @@ public class GltTicketOrder implements Serializable {
     @TableField(exist = false)
     private String warehouseLngAndLat;
 
+    @Schema(description = "配送方式：elevator(电梯) / stairs(步梯) / groundFloor(一楼商铺/其他)")
+    private String deliveryMethod;
+
+    @Schema(description = "楼层（步梯+送上楼时有值，从2开始）")
+    private Integer deliveryFloor;
+
+    @Schema(description = "配送费（步梯+送上楼时计算：数量 × (楼层-1)）")
+    private BigDecimal deliveryFee;
+
     @Schema(description = "排序(数字越小越靠前)")
     private Integer sortNumber;