From 4f42aa109cddbe6699f599fc6e379ed26f930de1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Sep 2021 19:09:21 +0800
Subject: [PATCH] fix some problem
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 40fcccc..e3d62ce 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -6,6 +6,35 @@
select * from mall_order_info where member_id=#{memberId} and id=#{id}
</select>
+ <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
+ select *
+ from mall_order_info a
+ left join mall_member b on a.member_id = b.id
+ <where>
+ a.del_flag=2
+ <if test="record != null">
+ <if test="record.payResult != null and record.payResult != ''">
+ and a.pay_result = #{record.payResult}
+ </if>
+ <if test="record.status != null and record.status != ''">
+ and a.status = #{record.status}
+ </if>
+ <if test="record.orderNo != null and record.orderNo != ''">
+ and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
+ </if>
+ <if test="record.name != null and record.name != ''">
+ and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ </if>
+ </where>
+ order by a.created_time desc
+ </select>
+
+ <select id="getMallOrderInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderVo">
+ select * from mall_order_info where id = #{id}
+ </select>
+
+
<resultMap id="OrderInfoMap" type="cc.mrbird.febs.mall.entity.MallOrderInfo">
<id column="id" property="id" />
<result column="order_no" property="orderNo" />
@@ -39,7 +68,7 @@
</collection>
</resultMap>
- <select id="selectOrderListInPage" resultMap="OrderInfoMap">
+ <select id="selectApiOrderListInPage" resultMap="OrderInfoMap">
select
a.*,
b.id item_id,
@@ -56,13 +85,14 @@
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
<where>
+ a.del_flag=2
<if test="record.query != null and record.query != ''">
and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
</if>
- <if test="record.status == 4">
+ <if test="record.status == 4 and record.status != 0">
and a.status in (5,6)
</if>
- <if test="record.status != 4">
+ <if test="record.status != 4 and record.status != 0">
and a.status = #{record.status}
</if>
</where>
@@ -85,6 +115,15 @@
b.amount
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
- where id=#{id}
+ where a.id=#{id}
+ </select>
+
+ <select id="selectMemberOrderStatusCnt" resultType="java.util.Map">
+ select
+ status,
+ count(1) cnt
+ from mall_order_info
+ where del_flag=2 and member_id=#{memberId}
+ group by status
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1