From bcc66e6d54badf46c576017f131de9aa6b9b2f0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 28 Dec 2022 17:26:59 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 0f58780..db95fed 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -44,14 +44,19 @@
</select>
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
- select *,
+ select a.*,
b.name memberName,
b.bind_phone memberBindPhone,
- b.phone memberPhone
- from mall_order_info a
+ b.phone memberPhone,
+ c.goods_name
+ from mall_order_item c
+ left join mall_order_info a on a.id = c.order_id
left join mall_member b on a.member_id = b.id
<where>
<if test="record != null">
+ <if test="record.goodsName != null and record.goodsName != ''">
+ and c.goods_name like CONCAT('%', CONCAT(#{record.goodsName}, '%'))
+ </if>
<if test="record.payResult != null and record.payResult != ''">
and a.pay_result = #{record.payResult}
</if>
@@ -66,6 +71,12 @@
</if>
<if test="record.name != null and record.name != ''">
and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ <if test="record.startTime != null and record.startTime != ''">
+ and a.order_time >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null and record.endTime != ''">
+ and a.order_time <= #{record.endTime}
</if>
</if>
</where>
@@ -99,6 +110,10 @@
<result column="carriage" property="carriage" />
<result column="remark" property="remark" />
<result column="del_flag" property="delFlag" />
+ <result column="deliver_type" property="deliverType" />
+ <result column="shop_id" property="shopId" />
+ <result column="subsidy_amount" property="subsidyAmount" />
+ <result column="pay_trade_no" property="payTradeNo" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -150,6 +165,12 @@
</if>
<if test="record.orderType != null">
and a.order_type=#{record.orderType}
+ </if>
+ <if test="record.allStatus == 2">
+ and a.status <![CDATA[< ]]> 4
+ </if>
+ <if test="record.allStatus == 3">
+ and a.status <![CDATA[>= ]]> 4
</if>
</where>
order by a.created_time desc
@@ -222,7 +243,7 @@
<select id="selectTotalAmount" resultType="java.math.BigDecimal">
select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
- where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
+ where member_id=#{memberId} and status = 4
</select>
<select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -296,4 +317,39 @@
#{item}
</foreach>
</select>
+
+ <select id="selectCountByCreateTimeAndMemberId" resultType="java.lang.Integer">
+ select
+ count(a.id)
+ from mall_order_info a
+ where
+ a.status = 4
+ and a.member_id = #{memberId}
+ <if test="createdTime != null">
+ and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+ </if>
+
+ </select>
+
+ <select id="selectTodayAmountByCreateTimeAndMemberId" resultType="java.math.BigDecimal">
+ select
+ ifnull(sum(a.subsidy_amount),0)
+ from mall_order_info a
+ where
+ a.status = 4
+ and a.member_id = #{memberId}
+ <if test="createdTime != null">
+ and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
+ </if>
+
+ </select>
+
+ <select id="selectOrderInfoByStatusAndMemberId" resultType="java.lang.Integer">
+ select
+ count(a.id)
+ from mall_order_info a
+ where
+ a.status <![CDATA[< ]]> 4
+ and a.member_id = #{memberId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1