From 27f8fa9cba4bcf96c82dba9a48d6dc2855d0ea9c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jun 2022 18:24:07 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 402284e..4ea59ab 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -20,6 +20,7 @@
<result property="goodsType" column="goods_type" />
<result property="hasCarriage" column="has_carriage" />
<result property="carriage" column="carriage" />
+ <result property="isNormal" column="is_normal" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -85,7 +86,7 @@
and a.is_normal = #{record.isNormal}
</if>
<if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
- and a.goods_type = #{record.goodsType}
+ and a.goods_type = #{record.goodsType} and a.present_price != 0
</if>
<if test="record.goodsType == 3">
and a.present_price = 0
@@ -204,12 +205,12 @@
select a.*,c.order_no from mall_goods a
inner join mall_order_item b on a.id=b.goods_id
inner join mall_order_info c on b.order_id=c.ID
- where c.status=4
+ where c.status in (2, 3, 4) and b.is_normal=2
<if test="memberId != null">
and c.member_id=#{memberId}
</if>
<if test="date != null">
- and date_format(c.receving_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ and date_format(c.pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1