From e497a05ce312d26864b0c23cad97da9eb32c2cc1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 16:01:34 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index 385b7f7..e458de1 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -12,6 +12,8 @@
a.reserve_time reserveTime,
a.status status,
a.remark remark,
+ a.unit_name unitName,
+ a.house_number houseNumber,
a.username name,
b.mobile_phone mobilePhone,
d.mobile jhyMobilePhone,
@@ -33,7 +35,8 @@
</foreach>
</if>
<if test="record.jwyName != null and record.jwyName != ''">
- and d.username like concat('%',#{record.jwyName},'%')
+ and (d.username like concat('%',#{record.jwyName},'%')
+ or d.mobile like concat('%',#{record.jwyName},'%'))
</if>
<if test="record.account != null and record.account != ''">
and ( a.username like concat('%',#{record.account},'%')
@@ -46,7 +49,20 @@
<if test="record.reserveTimeEnd != null">
and a.reserve_date <= #{record.reserveTimeEnd}
</if>
- order by a.CREATED_TIME desc
+ order by
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 1">
+ a.CREATED_TIME
+ </if>
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 2">
+ a.username
+ </if>
+
+ <if test="record.typePx != null and record.typePx != '' and record.typePx == 1">
+ asc
+ </if>
+ <if test="record.typePx != null and record.typePx != '' and record.typePx == 2">
+ desc
+ </if>
</select>
@@ -106,4 +122,8 @@
<select id="selectJhyInfoByUserId" resultType="com.xzx.gc.entity.JhyInfo">
select * from xzx_jhy_info where id = #{jhyId}
</select>
+
+ <select id="selectAddRessInfoByUserId" resultType="com.xzx.gc.entity.AddressInfo">
+ select * from xzx_user_address_info where user_id = #{userId}
+ </select>
</mapper>
--
Gitblit v1.9.1