From 4548c5045b3a5522ad14df7c939f0303c1e17587 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 11 Oct 2025 19:07:29 +0800
Subject: [PATCH] 配送费

---
 oying-system/src/main/resources/mapper/sh/OrderMapper.xml |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
index 61211e2..af9e255 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
@@ -9,6 +9,8 @@
         <result column="order_status_describe" property="orderStatusDescribe"/>
         <result column="order_remark" property="orderRemark"/>
         <result column="order_time" property="orderTime"/>
+        <result column="order_finish_time" property="orderFinishTime"/>
+        <result column="packaging_price" property="packagingPrice"/>
         <result column="send_price" property="sendPrice"/>
         <result column="send_type" property="sendType"/>
         <result column="user_id" property="userId"/>
@@ -16,6 +18,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"/>
@@ -41,6 +46,8 @@
         <result column="rider_name" property="riderName"/>
         <collection property="productSnapshots" ofType="com.oying.modules.sh.domain.OrderProductSnapshot">
             <id column="snapshot_id" property="snapshotId"/>
+            <result column="order_num" property="orderNum"/>
+            <result column="store_id" property="storeId"/>
             <result column="product_id" property="productId"/>
             <result column="product_code" property="productCode"/>
             <result column="product_barcode" property="productBarcode"/>
@@ -60,15 +67,16 @@
 
     <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.order_finish_time, o.packaging_price, 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
     </sql>
 
     <sql id="product_Column_List">
-        p.snapshot_id, p.product_id, p.product_code, p.product_barcode, p.product_name, p.product_title,
+        p.snapshot_id, p.order_num, p.store_id, p.product_id, p.product_code, p.product_barcode, p.product_name, p.product_title,
         p.product_main_image, p.product_description, p.param_data, p.unit_price, p.detail_count, p.original_price, p.paid_price,
         p.actually_pay_price, p.pay_state
     </sql>
@@ -119,7 +127,7 @@
                 or p.product_name like concat('%',#{blurry},'%')
                 or p.product_title like concat('%',#{blurry},'%')
                 or p.product_description like concat('%',#{blurry},'%')
-                or o.orderNum like concat('%',#{blurry},'%')
+                or o.order_num like concat('%',#{blurry},'%')
                 or o.order_describe like concat('%',#{blurry},'%')
                 or o.username like concat('%',#{blurry},'%'))
             </if>
@@ -136,16 +144,24 @@
 
     <update id="updateCloseStatus">
         update sh_order
-        set pay_state = #{payState}
+        set pay_state   = #{payState},
+            pay_message = #{payMessage}
         where order_num = #{orderNum}
     </update>
 
     <update id="updateOrderStatus">
         update sh_order
-        set order_status = #{key},
+        set order_status          = #{key},
             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