From e84450eda524efd94e9c86307108f7dfc4c0392c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Jul 2021 11:36:54 +0800
Subject: [PATCH] 20210706 积分拨付
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index b1ff9e4..1dd0fa0 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -12,9 +12,10 @@
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*weight*40),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ (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
@@ -27,16 +28,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},'%')
+ 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>
--
Gitblit v1.9.1