From 5a02b62b3b2b3663b89a1fb8be0c3f6ac1eb1d3f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Jun 2021 17:54:48 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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..a0f17dc 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -8,17 +8,19 @@
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,
+ (select ifnull(sum(price*weight*40),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
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
+ left join xzx_jhy_info d on d.user_id = a.jhy_id
WHERE 1 = 1
<if test="record.orderNo != null and record.orderNo != ''">
and a.order_no like concat('%',#{record.orderNo},'%')
@@ -27,19 +29,46 @@
and a.status = #{record.status}
</if>
<if test="record.account != null and record.account != ''">
- and ( b.name like concat('%',#{record.account},'%')
- or b.mobile_phone like concat('%',#{record.account},'%') )
+ and ( b.nick_name like concat('%',#{record.account},'%')
+ or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
</if>
<if test="record.reserveTimeStart != null">
- and a.reserve_time >= #{record.reserveTimeStart}
+ and a.reserve_date >= #{record.reserveTimeStart}
</if>
<if test="record.reserveTimeEnd != null">
- and a.reserve_time <= #{record.reserveTimeEnd}
+ and a.reserve_date <= #{record.reserveTimeEnd}
</if>
order by a.CREATED_TIME desc
</select>
+ <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.user_id = a.jhy_id
+ WHERE a.id=#{id}
+ </select>
+
+
+
</mapper>
--
Gitblit v1.9.1