From 37aa64f98149cae60c6a6be2935ecfb46e1e4517 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 12 May 2025 16:45:32 +0800
Subject: [PATCH] feat(mall): 会员等级名称展示及积分改名
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 1cb7ecf..6bc8228 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -13,6 +13,7 @@
<result property="goodsDetails" column="goods_details" />
<result property="isSale" column="is_sale" />
<result property="originalPrice" column="original_price" />
+ <result property="staticPropPrice" column="staticPropPrice" />
<result property="presentPrice" column="present_price" />
<result property="categoryId" column="category_id" />
<result property="volume" column="volume" />
@@ -29,6 +30,7 @@
<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" />
@@ -55,6 +57,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,
@@ -64,6 +67,7 @@
c.stock sku_stock,
c.sku_volume,
c.original_price sku_original_price,
+ a.original_price*a.static_prop staticPropPrice,
c.present_price sku_present_price,
c.style_id sku_style_id,
c.goods_weight sku_goods_weight,
@@ -75,6 +79,7 @@
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>
@@ -87,6 +92,7 @@
a.thumb,
a.unit,
a.original_price,
+ a.original_price*a.static_prop staticPropPrice,
a.present_price,
a.level_one_price,
a.level_two_price,
@@ -98,13 +104,19 @@
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">
@@ -114,8 +126,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
@@ -328,6 +343,7 @@
a.thumb,
a.unit,
a.original_price,
+ a.original_price*a.static_prop staticPropPrice,
a.present_price,
a.score,
a.is_hot,
--
Gitblit v1.9.1