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 |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 2f0e915..3162fc5 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -101,15 +101,19 @@
                 a.carriage_rule_id,
                 a.goods_weight,
                 a.order_number,
-                case when collection.id is null then 2 else 1 end hasCollect,
+                <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
-                 left join mall_member_collection collection on a.id=collection.goods_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">
@@ -119,9 +123,12 @@
                     <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
                     </if>

--
Gitblit v1.9.1