From c3ed9a07b0765834136afb6400d350d895584b51 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 01 Jul 2024 14:03:23 +0800
Subject: [PATCH] 后台
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 3b68816..d93f9d7 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" />
@@ -18,6 +19,11 @@
<result property="stock" column="stock" />
<result property="score" column="score" />
<result property="goodsType" column="goods_type" />
+ <result property="hasCarriage" column="has_carriage" />
+ <result property="carriage" column="carriage" />
+ <result property="isNormal" column="is_normal" />
+ <result property="scorePercent" column="score_percent" />
+ <result property="sortCnt" column="sort_cnt" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -68,6 +74,7 @@
a.present_price,
a.score,
a.is_hot,
+ a.sort_cnt,
min(b.present_price) price,
sum(b.sku_volume) saleVolume
from mall_goods a
@@ -82,8 +89,11 @@
<if test="record.isNormal != null and record.isNormal != ''">
and a.is_normal = #{record.isNormal}
</if>
- <if test="record.goodsType != null and record.goodsType != ''">
- and a.goods_type = #{record.goodsType}
+ <if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
+ and a.goods_type = #{record.goodsType} and a.present_price != 0
+ </if>
+ <if test="record.goodsType == 3">
+ and a.present_price = 0
</if>
<if test="record.categoryId != null and record.categoryId != ''">
and (c.id = #{record.categoryId} or c.parent_id=#{record.categoryId})
@@ -96,22 +106,23 @@
group by a.id
order by a.id desc
) a
- <if test="record.sortType != null">
- <if test="record.sortType == 1">
- order by a.is_hot, a.saleVolume desc, a.id
- </if>
- <if test="record.sortType == 2">
- order by a.saleVolume desc
- </if>
- <if test="record.sortType == 3 and record.sort == 'asc'">
- order by a.price
- </if>
- <if test="record.sortType == 3 and record.sort == 'desc'">
- order by a.price desc
- </if>
- <if test="record.sortType == 4">
- order by a.id desc
- </if>
+ <if test="record.sortType == null">
+ order by a.sort_cnt asc
+ </if>
+ <if test="record.sortType == 1">
+ order by a.sort_cnt asc
+ </if>
+ <if test="record.sortType == 2">
+ order by a.saleVolume desc
+ </if>
+ <if test="record.sortType == 3 and record.sort == 'asc'">
+ order by a.price
+ </if>
+ <if test="record.sortType == 3 and record.sort == 'desc'">
+ order by a.price desc
+ </if>
+ <if test="record.sortType == 4">
+ order by a.id desc
</if>
</select>
@@ -130,6 +141,8 @@
a.is_hot,
a.score,
a.is_normal,
+ a.sort_cnt,
+ a.score_percent,
b.name categaryName,
IFNULL(sum(c.sku_volume), a.volume) skuVolume,
IFNULL(sum(c.stock), a.stock) stock
@@ -147,7 +160,7 @@
</if>
</where>
group by a.id
- order by a.created_time desc
+ order by a.is_normal,a.sort_cnt asc
</select>
<select id="selectMallGoodsCountByGoodsName" resultType="java.lang.Integer">
@@ -199,12 +212,32 @@
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>
+ and show_state = 1
+ <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