From e033f8a6f821cdb06bbf17e5f10da2d8a8d7297e Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 17 May 2022 21:45:39 +0800
Subject: [PATCH] fix score orderList and flowList and editor
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 40d89d5..7ba6277 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -7,7 +7,10 @@
</select>
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
- select *,b.name memberName,b.phone memberPhone
+ select *,
+ b.name memberName,
+ b.bind_phone memberBindPhone,
+ b.phone memberPhone
from mall_order_info a
left join mall_member b on a.member_id = b.id
<where>
@@ -15,6 +18,9 @@
<if test="record != null">
<if test="record.payResult != null and record.payResult != ''">
and a.pay_result = #{record.payResult}
+ </if>
+ <if test="record.orderType != null">
+ and a.order_type = #{record.orderType}
</if>
<if test="record.status != null and record.status != ''">
and a.status = #{record.status}
@@ -52,6 +58,7 @@
<result column="address" property="address" />
<result column="longitude" property="longitude" />
<result column="latitude" property="latitude" />
+ <result column="order_type" property="orderType" />
<result column="remark" property="remark" />
<result column="del_flag" property="delFlag" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
@@ -101,6 +108,9 @@
</if>
<if test="record.memberId != null">
and a.member_id=#{record.memberId}
+ </if>
+ <if test="record.orderType != null">
+ and a.order_type=#{record.orderType}
</if>
</where>
order by a.created_time desc
@@ -169,4 +179,20 @@
group by a.invite_id
) a
</select>
+
+ <select id="selectTotalAmount" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+ where member_id=#{memberId} and status = 4
+ </select>
+
+ <select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+ where status = 4
+ <if test="member != null">
+ and member_id=#{memberId}
+ </if>
+ <if test="date != null">
+ and date_format(a.receving_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1