From 0526acc407572d23b1030e0ffd842406ae0bc121 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
oying-system/src/main/resources/mapper/sh/OrderAddressSnapshotMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderAddressSnapshotMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderAddressSnapshotMapper.xml
index e5c36b7..5301d9e 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderAddressSnapshotMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderAddressSnapshotMapper.xml
@@ -3,13 +3,14 @@
<mapper namespace="com.oying.modules.sh.mapper.OrderAddressSnapshotMapper">
<resultMap id="BaseResultMap" type="com.oying.modules.sh.domain.OrderAddressSnapshot">
<id column="snapshot_id" property="snapshotId"/>
- <result column="order_id" property="orderId"/>
+ <result column="order_num" property="orderNum"/>
<result column="receiver_name" property="receiverName"/>
<result column="receiver_phone" property="receiverPhone"/>
<result column="province" property="province"/>
<result column="city" property="city"/>
<result column="district" property="district"/>
<result column="street" property="street"/>
+ <result column="short_address" property="shortAddress"/>
<result column="detail" property="detail"/>
<result column="longitude" property="longitude"/>
<result column="latitude" property="latitude"/>
@@ -17,7 +18,8 @@
</resultMap>
<sql id="Base_Column_List">
- snapshot_id, order_id, receiver_name, receiver_phone, province, city, district, street, detail, longitude, latitude, tag
+ snapshot_id, order_num, receiver_name, receiver_phone, province, city, district, street, short_address,
+ detail, longitude, latitude, tag
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -25,10 +27,16 @@
<include refid="Base_Column_List"/>
from sh_order_address_snapshot
<where>
- <if test="criteria.orderId != null">
- and order_id = #{criteria.orderId}
+ <if test="criteria.orderNum != null">
+ and order_num = #{criteria.orderNum}
</if>
</where>
order by snapshot_id desc
</select>
-</mapper>
\ No newline at end of file
+ <select id="queryByOrderNum" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sh_order_address_snapshot
+ where order_num = #{orderNum}
+ </select>
+</mapper>
--
Gitblit v1.9.3