From 6e6a5bbc6ed0bc05da9ed8c0ab9b55bde79c5b03 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Nov 2021 15:35:46 +0800
Subject: [PATCH] 20211108
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index aff9f1e..e458de1 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -12,8 +12,11 @@
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,
(select ifnull(sum(score),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
(select ifnull(sum(weight),0) from xzx_jhy_order_items where order_id = a.id) totalWeight,
d.username username
@@ -25,11 +28,15 @@
<if test="record.orderNo != null and record.orderNo != ''">
and a.order_no like concat('%',#{record.orderNo},'%')
</if>
- <if test="record.status != null and record.status != ''">
- and a.status = #{record.status}
+ <if test="record.status.size > 0">
+ and a.status in
+ <foreach collection="record.status" item="sta" open="(" separator="," close=")">
+ #{sta}
+ </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},'%')
@@ -42,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>
@@ -98,4 +118,12 @@
inner join xzx_jhy_order_items b on a.id=b.order_id
where a.user_id=#{userId}
</select>
+
+ <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