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 | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index 6c1703a..f129dc7 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -8,7 +8,7 @@
a.order_no orderNo,
a.area area,
a.address address,
- CONVERT(varchar(100), reserve_date, 23) reserveDate,
+ date_format(reserve_date,'%Y-%m-%d') reserveDate,
a.reserve_time reserveTime,
a.status status,
a.remark remark,
@@ -43,4 +43,31 @@
+ <select id="viewJhyOrder" resultType="com.xzx.gc.shop.vo.ViewJhyOrderVo">
+ SELECT
+ a.id id,
+ a.order_no orderNo,
+ b.nick_name nickName,
+ 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 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 a.id=#{id}
+ </select>
+
+
+
</mapper>
--
Gitblit v1.9.1