From 7d1157b485064e8709a05f66a2a046667a524429 Mon Sep 17 00:00:00 2001
From: Artyom <2750916302@qq.com>
Date: Wed, 18 Dec 2024 21:20:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=94=A8=E6=88=B7=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E8=8F=9C=E5=93=81=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=E5=92=8C?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/DishFlavorMapper.xml | 19 +++-
.../resources/mapper/OrderDetailMapper.xml | 10 +-
.../src/main/resources/mapper/OrderMapper.xml | 53 +++++++----
.../uni-ui/lib/uni-list-item/uni-list-item.js | 93 +++++++++++--------
4 files changed, 109 insertions(+), 66 deletions(-)
diff --git a/sky-server/src/main/resources/mapper/DishFlavorMapper.xml b/sky-server/src/main/resources/mapper/DishFlavorMapper.xml
index 6f2008b..d6b0f12 100644
--- a/sky-server/src/main/resources/mapper/DishFlavorMapper.xml
+++ b/sky-server/src/main/resources/mapper/DishFlavorMapper.xml
@@ -1,19 +1,30 @@
+
+
+
- insert into dish_flavor (dish_id, name, value) values
+
+ insert into dish_flavor (dish_id, name, value) values
+
+
(#{flavor.dishId},#{flavor.name},#{flavor.value})
+
+
delete from dish_flavor where dish_id in
-
- #{dishId}
-
+
+
+
+ #{dishId}
+
+
diff --git a/sky-server/src/main/resources/mapper/OrderDetailMapper.xml b/sky-server/src/main/resources/mapper/OrderDetailMapper.xml
index ff09f97..017a49b 100644
--- a/sky-server/src/main/resources/mapper/OrderDetailMapper.xml
+++ b/sky-server/src/main/resources/mapper/OrderDetailMapper.xml
@@ -1,14 +1,18 @@
+
-
+
+
insert into order_detail(name, image, order_id, dish_id, setmeal_id, dish_flavor, amount)
- values
+ values
+
+
(#{od.name},#{od.image},#{od.orderId},#{od.dishId},#{od.setmealId},#{od.dishFlavor},#{od.amount})
+
-
diff --git a/sky-server/src/main/resources/mapper/OrderMapper.xml b/sky-server/src/main/resources/mapper/OrderMapper.xml
index 7ff570e..ccab981 100644
--- a/sky-server/src/main/resources/mapper/OrderMapper.xml
+++ b/sky-server/src/main/resources/mapper/OrderMapper.xml
@@ -1,23 +1,28 @@
+
+
+
- insert into orders(number, status, user_id, address_book_id, order_time,
- checkout_time, pay_method, pay_status, amount, remark,
- phone, address, user_name, consignee, cancel_reason,
- rejection_reason, cancel_time, estimated_delivery_time,
- delivery_status, delivery_time, pack_amount,
- tableware_number, tableware_status)
- values(#{number},#{status},#{userId},#{addressBookId},#{orderTime},#{checkoutTime},
- #{payMethod},#{payStatus},#{amount},#{remark},#{phone},#{address},#{userName},
- #{consignee},#{cancelReason},#{rejectionReason},#{cancelTime},#{estimatedDeliveryTime},
- #{deliveryStatus},#{deliveryTime},#{packAmount},#{tablewareNumber},#{tablewareStatus})
+ insert into orders(number, status, user_id, address_book_id, order_time,
+ checkout_time, pay_method, pay_status, amount, remark,
+ phone, address, user_name, consignee, cancel_reason,
+ rejection_reason, cancel_time, estimated_delivery_time,
+ delivery_status, delivery_time, pack_amount,
+ tableware_number, tableware_status)
+ values(#{number},#{status},#{userId},#{addressBookId},#{orderTime},#{checkoutTime},
+ #{payMethod},#{payStatus},#{amount},#{remark},#{phone},#{address},#{userName},
+ #{consignee},#{cancelReason},#{rejectionReason},#{cancelTime},#{estimatedDeliveryTime},
+ #{deliveryStatus},#{deliveryTime},#{packAmount},#{tablewareNumber},#{tablewareStatus})
+
update orders
+
cancel_reason=#{cancelReason},
@@ -45,10 +50,13 @@
where id = #{id}
+
+
+
+
+
+
+
+