From 1fc5510367dcf321ac85e50e31c9dcdaaf5cd09e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 11:56:27 +0800
Subject: [PATCH] 20221221
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index be202c1..c3357cf 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" />
@@ -21,6 +22,8 @@
<result property="hasCarriage" column="has_carriage" />
<result property="carriage" column="carriage" />
<result property="isNormal" column="is_normal" />
+ <result property="subsidyAmount" column="subsidy_amount" />
+ <result property="starRating" column="star_rating" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -69,6 +72,8 @@
a.thumb,
a.original_price,
a.present_price,
+ a.subsidy_amount,
+ a.star_rating,
a.score,
a.is_hot,
min(b.present_price) price,
@@ -136,6 +141,8 @@
a.is_hot,
a.score,
a.is_normal,
+ a.subsidy_amount,
+ a.star_rating,
b.name categaryName,
IFNULL(sum(c.sku_volume), a.volume) skuVolume,
IFNULL(sum(c.stock), a.stock) stock
@@ -205,12 +212,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