From 3766a0aceea67c54ba7623ccd8ec938921cf24ad Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 23 Sep 2021 18:50:40 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 6e2c82d..a519661 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -53,6 +53,7 @@
<result column="longitude" property="longitude" />
<result column="latitude" property="latitude" />
<result column="remark" property="remark" />
+ <result column="del_flag" property="delFlag" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -68,7 +69,7 @@
</collection>
</resultMap>
- <select id="selectOrderListInPage" resultMap="OrderInfoMap">
+ <select id="selectApiOrderListInPage" resultMap="OrderInfoMap">
select
a.*,
b.id item_id,
@@ -85,13 +86,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>
@@ -114,6 +116,24 @@
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>
+
+ <select id="getMallOrderDetailById" resultType="cc.mrbird.febs.mall.vo.AdminOrderDetailVo">
+ select * from mall_order_info a where a.id = #{id}
+ </select>
+
+ <select id="getMallOrderItemByOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+ select * from mall_order_item where order_id = #{id}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1