From af25ae6a29b38b1a6ad53dbbebc2da8897757bbd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 10:09:54 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 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 afa46fe..dc41949 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -8,10 +8,11 @@
a.order_no orderNo,
a.area area,
a.address address,
+ date_format(reserve_date,'%Y-%m-%d') reserveDate,
a.reserve_time reserveTime,
a.status status,
a.remark remark,
- b.name name,
+ b.nick_name name,
b.mobile_phone mobilePhone,
(select ifnull(sum(price),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
d.username username
@@ -27,7 +28,7 @@
and a.status = #{record.status}
</if>
<if test="record.account != null and record.account != ''">
- and ( b.name like concat('%',#{record.account},'%')
+ and ( b.nick_name like concat('%',#{record.account},'%')
or b.mobile_phone like concat('%',#{record.account},'%') )
</if>
<if test="record.reserveTimeStart != null">
@@ -42,4 +43,49 @@
+ <select id="viewJhyOrder" resultType="com.xzx.gc.shop.vo.ViewJhyOrderVo">
+ SELECT
+ a.id id,
+ a.order_no orderNo,
+ b.nick_name name,
+ b.mobile_phone mobilePhone,
+ a.area area,
+ a.address address,
+ date_format(a.reserve_date,'%Y-%m-%d') reserveDate,
+ a.reserve_time reserveTime,
+ a.status status,
+ d.username username,
+ d.mobile mobile,
+ date_format(a.receiving_time,'%Y-%m-%d %H:%i:%S') receivingTime,
+ a.remark remark,
+ a.comment comment,
+ a.score score,
+ a.is_anonymous isAnonymous
+ FROM
+ xzx_jhy_order a
+ left join xzx_user_info b on b.user_id = a.user_id
+ left join xzx_jhy_info d on d.id = a.jhy_id
+ WHERE 1 = 1
+ <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>
+ <if test="record.account != null and record.account != ''">
+ and ( b.nick_name like concat('%',#{record.account},'%')
+ or b.mobile_phone like concat('%',#{record.account},'%') )
+ </if>
+ <if test="record.reserveTimeStart != null">
+ and a.reserve_time >= #{record.reserveTimeStart}
+ </if>
+
+ <if test="record.reserveTimeEnd != null">
+ and a.reserve_time <= #{record.reserveTimeEnd}
+ </if>
+ order by a.CREATED_TIME desc
+ </select>
+
+
+
</mapper>
--
Gitblit v1.9.1