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/resources/mapper/sh/OrderMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
index 1f46c1c..4ec5aec 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
@@ -16,6 +16,9 @@
<result column="store_id" property="storeId"/>
<result column="store_name" property="storeName"/>
<result column="store_logo" property="storeLogo"/>
+ <result column="store_address" property="storeAddress"/>
+ <result column="store_longitude" property="storeLongitude"/>
+ <result column="store_latitude" property="storeLatitude"/>
<result column="order_describe" property="orderDescribe"/>
<result column="order_original_price" property="originalPrice"/>
<result column="order_paid_price" property="paidPrice"/>
@@ -60,8 +63,9 @@
<sql id="Base_Column_List">
o.order_id, o.order_num, o.order_store_num, o.order_status, o.order_status_describe,
- o.order_remark, o.order_time, o.send_time, o.send_type, o.user_id, o.username, o.store_id,
- o.store_name, o.store_logo, o.order_describe, o.original_price order_original_price, o.paid_price order_paid_price,
+ o.order_remark, o.order_time, o.send_price, o.send_type, o.user_id, o.username, o.store_id,
+ o.store_name, o.store_logo, o.store_address, o.store_longitude, o.store_latitude,
+ o.order_describe, o.original_price order_original_price, o.paid_price order_paid_price,
o.actually_pay_price order_actually_pay_price, o.pay_state order_pay_state, o.pay_message, o.pay_type, o.pay_time, o.expire_time,
o.openid, o.app_id, o.timestamp, o.nonce_str, o.package_val, o.sign_type, o.pay_sign,
o.create_by, o.create_time, o.update_by, o.update_time, o.rider_id, o.rider_phone, o.rider_name
@@ -147,6 +151,13 @@
order_status_describe = #{value}
where order_num = #{orderNum}
</update>
+ <update id="updateRider">
+ update sh_order
+ set rider_id = #{riderId},
+ rider_phone = #{phone},
+ rider_name = #{cardName}
+ where order_num = #{orderNum}
+ </update>
<select id="findAll" resultMap="BaseResultMap">
select o.*,
--
Gitblit v1.9.3