From 0741dc7f25811ea2acb4127fc43d1dc9a802221c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 21:37:07 +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, 3 insertions(+), 21 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index dc41949..f129dc7 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -47,7 +47,7 @@
SELECT
a.id id,
a.order_no orderNo,
- b.nick_name name,
+ b.nick_name nickName,
b.mobile_phone mobilePhone,
a.area area,
a.address address,
@@ -58,32 +58,14 @@
d.mobile mobile,
date_format(a.receiving_time,'%Y-%m-%d %H:%i:%S') receivingTime,
a.remark remark,
- a.comment comment,
+ a. COMMENT comments,
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
+ WHERE a.id=#{id}
</select>
--
Gitblit v1.9.1