From 529ad9dd8d1876b57e852bc45b602ba3ccc8df2a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Apr 2024 17:19:08 +0800
Subject: [PATCH] 公告-首页公告调整
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index b5bf405..3162fc5 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -26,6 +26,10 @@
<result property="carriageAmount" column="carriage_amount" />
<result property="carriageRuleId" column="carriage_rule_id" />
<result property="goodsWeight" column="goods_weight" />
+ <result property="levelOnePrice" column="level_one_price" />
+ <result property="levelTwoPrice" column="level_two_price" />
+ <result property="levelThreePrice" column="level_three_price" />
+ <result property="hasCollect" column="hasCollect" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -42,6 +46,9 @@
<result property="goodsId" column="sku_goods_id" />
<result property="skuGoodsWeight" column="sku_goods_weight" />
<result property="sample" column="sample" />
+ <result property="levelOnePrice" column="sku_level_one_price" />
+ <result property="levelTwoPrice" column="sku_level_two_price" />
+ <result property="levelThreePrice" column="sku_level_three_price" />
</collection>
</collection>
</resultMap>
@@ -49,6 +56,7 @@
<select id="selectGoodsDetailById" resultMap="MallGoodsMap">
select
a.*,
+ case when collection.id is null then 2 else 1 end hasCollect,
b.id style_id,
b.name style_name,
b.goods_id style_goods_id,
@@ -62,10 +70,14 @@
c.style_id sku_style_id,
c.goods_weight sku_goods_weight,
c.sample sample,
+ c.level_one_price sku_level_one_price,
+ c.level_two_price sku_level_two_price,
+ c.level_three_price sku_level_three_price,
c.goods_id sku_goods_id
from mall_goods a
left join mall_goods_style b on a.id = b.goods_id
left join mall_goods_sku c on b.id=c.style_id
+ left join mall_member_collection collection on a.id=collection.goods_id
where a.id=#{id}
</select>
@@ -76,21 +88,32 @@
a.goods_name,
a.goods_introdution goodsIntroduction,
a.thumb,
+ a.unit,
a.original_price,
a.present_price,
+ a.level_one_price,
+ a.level_two_price,
+ a.level_three_price,
a.score,
a.is_hot,
a.carriage_type,
a.carriage_amount,
a.carriage_rule_id,
a.goods_weight,
+ a.order_number,
+ <if test="record.memberId != null">
+ case when collection.id is null then 2 else 1 end hasCollect,
+ </if>
min(b.id) skuId,
min(b.present_price) price,
- sum(b.stock) stock,
+ ifnull(sum(b.stock), a.stock) stock,
sum(b.sku_volume) saleVolume
from mall_goods a
left join mall_goods_sku b on a.id=b.goods_id
left join mall_goods_category c on a.category_id=c.id
+ <if test="record.memberId != null">
+ left join mall_member_collection collection on a.id=collection.goods_id and collection.member_id=#{record.memberId}
+ </if>
<where>
a.is_sale=1
<if test="record != null">
@@ -100,8 +123,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 record.goodsType != 3">
+ <if test="record.goodsType != null and record.goodsType != '' and record.goodsType == 1">
and a.goods_type = #{record.goodsType} and a.present_price != 0
+ </if>
+ <if test="record.goodsType != null and record.goodsType != '' and record.goodsType == 2">
+ and a.goods_type = #{record.goodsType}
</if>
<if test="record.goodsType == 3">
and a.present_price = 0
@@ -118,8 +144,11 @@
order by a.order_number ASC
) 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 == 1">
- order by a.is_hot, a.saleVolume desc, a.id
+ order by a.order_number ASC
</if>
<if test="record.sortType == 2">
order by a.saleVolume desc
@@ -309,6 +338,7 @@
a.goods_name,
a.goods_introdution goodsIntroduction,
a.thumb,
+ a.unit,
a.original_price,
a.present_price,
a.score,
@@ -317,6 +347,7 @@
a.carriage_amount,
a.carriage_rule_id,
a.goods_weight,
+ a.order_number,
min(b.id) skuId,
min(b.present_price) price,
sum(b.stock) stock,
@@ -351,8 +382,11 @@
order by a.order_number ASC
) 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 == 1">
- order by a.is_hot, a.saleVolume desc, a.id
+ order by a.order_number ASC
</if>
<if test="record.sortType == 2">
order by a.saleVolume desc
--
Gitblit v1.9.1