From a225da9a879c2becb13627a5f5d573d022bad1be Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 29 Aug 2022 17:53:14 +0800 Subject: [PATCH] 20220822 --- src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml index 1baaafd..a4fd6cb 100644 --- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml +++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml @@ -150,6 +150,7 @@ <result property="price" column="price" /> <result property="amount" column="amount" /> <result property="isNormal" column="is_normal" /> + <result property="state" column="state" /> </collection> </resultMap> @@ -164,6 +165,7 @@ b.style_name, b.sku_name, b.sku_image, + b.state, b.cnt, b.price, b.amount, @@ -190,7 +192,7 @@ and a.status = #{record.status} </if> <if test="record.status == 5"> - and a.status = 7 + and a.status = 7 or b.state in (2,3) </if> <if test="record.memberId != null"> and a.member_id=#{record.memberId} @@ -236,7 +238,6 @@ a.status, count(1) cnt from mall_order_info a - inner join mall_order_item b on a.id=b.order_id inner join mall_team_leader c on a.take_unique_code=c.unique_code where a.del_flag=2 and a.member_id=#{memberId} group by a.status -- Gitblit v1.9.1