From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/UserAddressServiceDaoImplMapper.xml | 178 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 92 insertions(+), 86 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/UserAddressServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserAddressServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index d4b6529..15afdd8
--- a/java110-db/src/main/resources/mapper/user/UserAddressServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserAddressServiceDaoImplMapper.xml
@@ -5,111 +5,117 @@
<mapper namespace="userAddressServiceDaoImpl">
-
-
-
<!-- 淇濆瓨鐢ㄦ埛鑱旂郴鍦板潃淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveUserAddressInfo" parameterType="Map">
insert into u_user_address(
-area_code,is_default,address,tel,user_id,address_id
-) values (
-#{areaCode},#{isDefault},#{address},#{tel},#{userId},#{addressId}
-)
+ area_code,is_default,address,tel,user_id,address_id,username
+ ) values (
+ #{areaCode},#{isDefault},#{address},#{tel},#{userId},#{addressId},#{username}
+ )
</insert>
-
<!-- 鏌ヨ鐢ㄦ埛鑱旂郴鍦板潃淇℃伅 add by wuxw 2018-07-03 -->
<select id="getUserAddressInfo" parameterType="Map" resultType="Map">
- select t.area_code,t.area_code areaCode,t.is_default,t.is_default isDefault,t.address,t.tel,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id userId,t.address_id,t.address_id addressId
-from u_user_address t
-where 1 =1
-<if test="areaCode !=null and areaCode != ''">
- and t.area_code= #{areaCode}
-</if>
-<if test="isDefault !=null and isDefault != ''">
- and t.is_default= #{isDefault}
-</if>
-<if test="address !=null and address != ''">
- and t.address= #{address}
-</if>
-<if test="tel !=null and tel != ''">
- and t.tel= #{tel}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
-</if>
-<if test="addressId !=null and addressId != ''">
- and t.address_id= #{addressId}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+ select t.area_code,t.area_code areaCode,t.is_default,t.is_default
+ isDefault,t.address,t.tel,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id userId,t.address_id,t.address_id
+ addressId,t.username
+ from u_user_address t
+ where 1 =1
+ <if test="areaCode !=null and areaCode != ''">
+ and t.area_code= #{areaCode}
+ </if>
+ <if test="isDefault !=null and isDefault != ''">
+ and t.is_default= #{isDefault}
+ </if>
+ <if test="address !=null and address != ''">
+ and t.address= #{address}
+ </if>
+ <if test="tel !=null and tel != ''">
+ and t.tel= #{tel}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
+ <if test="addressId !=null and addressId != ''">
+ and t.address_id= #{addressId}
+ </if>
+ <if test="username !=null and username != ''">
+ and t.username= #{username}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
-
-
<!-- 淇敼鐢ㄦ埛鑱旂郴鍦板潃淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateUserAddressInfo" parameterType="Map">
- update u_user_address t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="areaCode !=null and areaCode != ''">
-, t.area_code= #{areaCode}
-</if>
-<if test="isDefault !=null and isDefault != ''">
-, t.is_default= #{isDefault}
-</if>
-<if test="address !=null and address != ''">
-, t.address= #{address}
-</if>
-<if test="tel !=null and tel != ''">
-, t.tel= #{tel}
-</if>
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if>
- where 1=1 <if test="addressId !=null and addressId != ''">
-and t.address_id= #{addressId}
-</if>
+ update u_user_address t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="areaCode !=null and areaCode != ''">
+ , t.area_code= #{areaCode}
+ </if>
+ <if test="isDefault !=null and isDefault != ''">
+ , t.is_default= #{isDefault}
+ </if>
+ <if test="address !=null and address != ''">
+ , t.address= #{address}
+ </if>
+ <if test="tel !=null and tel != ''">
+ , t.tel= #{tel}
+ </if>
+ <if test="username !=null and username != ''">
+ , t.username= #{username}
+ </if>
+ where 1=1
+ <if test="addressId !=null and addressId != ''">
+ and t.address_id= #{addressId}
+ </if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
</update>
<!-- 鏌ヨ鐢ㄦ埛鑱旂郴鍦板潃鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryUserAddresssCount" parameterType="Map" resultType="Map">
- select count(1) count
-from u_user_address t
-where 1 =1
-<if test="areaCode !=null and areaCode != ''">
- and t.area_code= #{areaCode}
-</if>
-<if test="isDefault !=null and isDefault != ''">
- and t.is_default= #{isDefault}
-</if>
-<if test="address !=null and address != ''">
- and t.address= #{address}
-</if>
-<if test="tel !=null and tel != ''">
- and t.tel= #{tel}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
-</if>
-<if test="addressId !=null and addressId != ''">
- and t.address_id= #{addressId}
-</if>
+ <select id="queryUserAddresssCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from u_user_address t
+ where 1 =1
+ <if test="areaCode !=null and areaCode != ''">
+ and t.area_code= #{areaCode}
+ </if>
+ <if test="isDefault !=null and isDefault != ''">
+ and t.is_default= #{isDefault}
+ </if>
+ <if test="address !=null and address != ''">
+ and t.address= #{address}
+ </if>
+ <if test="tel !=null and tel != ''">
+ and t.tel= #{tel}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
+ <if test="username !=null and username != ''">
+ and t.username= #{username}
+ </if>
+ <if test="addressId !=null and addressId != ''">
+ and t.address_id= #{addressId}
+ </if>
- </select>
+ </select>
</mapper>
--
Gitblit v1.8.0