From 7c6f033b8754b07bf5c75ae8745a982d76f9abb4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Sep 2022 19:28:14 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
---
src/main/resources/mapper/modules/MallRefundMapper.xml | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallRefundMapper.xml b/src/main/resources/mapper/modules/MallRefundMapper.xml
index 2de0197..a3d9624 100644
--- a/src/main/resources/mapper/modules/MallRefundMapper.xml
+++ b/src/main/resources/mapper/modules/MallRefundMapper.xml
@@ -4,7 +4,11 @@
<select id="selectByItemIdAndOrderIdAndState" resultType="cc.mrbird.febs.mall.entity.MallRefundEntity">
- select a.* from mall_refund a
+ select a.*,
+ c.cnt
+ from mall_refund a
+ inner join mall_order_info b on a.order_id = b.id
+ inner join mall_order_item c on a.item_id = c.id
<where>
<if test="itemId != null and itemId != ''">
and a.item_id = #{itemId}
@@ -16,16 +20,42 @@
and a.state = #{state}
</if>
</where>
-
+ order by a.CREATED_TIME desc
</select>
<select id="getOrderRefundListInPage" resultType="cc.mrbird.febs.mall.entity.MallRefundEntity">
- select a.* from mall_refund a
+ select a.*,
+ b.order_time orderTime,
+ b.order_no orderNo,
+ b.status,
+ c.goods_name goodsName,
+ c.cnt,
+ d.name refundMemberName,
+ d.phone refundMemberPhone,
+ e.name leaderName,
+ e.phone leaderPhone
+ from mall_refund a
+ inner join mall_order_info b on a.order_id = b.id
+ inner join mall_order_item c on a.item_id = c.id
+ inner join mall_member d on a.member_id = d.id
+ inner join mall_team_leader e on b.take_unique_code = e.unique_code
<where>
<if test="record != null" >
<if test="record.state!=null and record.state!=''">
and a.state = #{record.state}
</if>
+ <if test="record.refundMemberName!=null and record.refundMemberName!=''">
+ and d.name like concat('%',#{record.refundMemberName},'%')
+ </if>
+ <if test="record.refundMemberPhone!=null and record.refundMemberPhone!=''">
+ and d.phone like concat('%',#{record.refundMemberPhone},'%')
+ </if>
+ <if test="record.leaderName!=null and record.leaderName!=''">
+ and e.name like concat('%',#{record.leaderName},'%')
+ </if>
+ <if test="record.leaderPhone!=null and record.leaderPhone!=''">
+ and e.phone like concat('%',#{record.leaderPhone},'%')
+ </if>
</if>
</where>
order by a.CREATED_TIME desc
--
Gitblit v1.9.1