From a49c0a258840d6c7f496c88d537fdb9d20ce324c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Jun 2021 17:35:54 +0800
Subject: [PATCH] 20210625 商品分类

---
 gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml |    5 +++--
 1 files changed, 3 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..6c1703a 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,
+               CONVERT(varchar(100), reserve_date, 23) 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">

--
Gitblit v1.9.1