From 7804b65c502ac9b2bb93f6f64dff53e2a1322f79 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 23 Jun 2022 10:40:48 +0800 Subject: [PATCH] 20220528 --- src/main/resources/mapper/modules/MallGoodsMapper.xml | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml index 402284e..66ce2c7 100644 --- a/src/main/resources/mapper/modules/MallGoodsMapper.xml +++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml @@ -9,6 +9,7 @@ <result property="goodsIntrodution" column="goods_introdution" /> <result property="unit" column="unit" /> <result property="thumb" column="thumb" /> + <result property="goodsParameter" column="goods_parameter" /> <result property="goodsDetails" column="goods_details" /> <result property="isSale" column="is_sale" /> <result property="originalPrice" column="original_price" /> @@ -20,6 +21,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 +87,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 +206,31 @@ 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> + + <select id="selectMallGoodsCommentListQueryInPage" resultType="cc.mrbird.febs.mall.vo.MallGoodsCommentVo"> + select + a.*, + b.name name, + b.avatar avatar + from mall_goods_comment a + left join mall_member b on b.id = a.member_id + <where> + <if test="record != null"> + <if test="record.goodsId != null and record.goodsId != ''"> + and a.goods_id=#{record.goodsId} + </if> + </if> + </where> + group by a.id + order by a.created_time desc + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.1