From abf323cc9a96877ead8aa5e5caacff8c75e4d2e7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 11:23:42 +0800
Subject: [PATCH] 20210702 积分拨付
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index f073cf6..91ee9e4 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -12,14 +12,15 @@
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),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
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 +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},'%')
- or b.mobile_phone 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>
@@ -47,7 +51,7 @@
SELECT
a.id id,
a.order_no orderNo,
- b.nick_name name,
+ b.nick_name nickName,
b.mobile_phone mobilePhone,
a.area area,
a.address address,
@@ -58,13 +62,13 @@
d.mobile mobile,
date_format(a.receiving_time,'%Y-%m-%d %H:%i:%S') receivingTime,
a.remark remark,
- a.comment comment,
+ 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
+ left join xzx_jhy_info d on d.user_id = a.jhy_id
WHERE a.id=#{id}
</select>
--
Gitblit v1.9.1