From fced9fc9ee879552238a1c83f884c7fa61ba6c07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 15:14:22 +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 | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index c502610..6c58953 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -12,14 +12,16 @@
a.reserve_time reserveTime,
a.status status,
a.remark remark,
- b.nick_name name,
+ a.username name,
b.mobile_phone mobilePhone,
- (select ifnull(sum(price)*40,0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ d.mobile jhyMobilePhone,
+ (select ifnull(sum(score),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,16 +29,19 @@
<if test="record.status != null and record.status != ''">
and a.status = #{record.status}
</if>
+ <if test="record.jwyName != null and record.jwyName != ''">
+ and d.username like concat('%',#{record.jwyName},'%')
+ </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},'%') )
+ and ( a.username 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>
@@ -64,7 +69,7 @@
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 a.id=#{id}
</select>
--
Gitblit v1.9.1