From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 17:16:57 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法,支持分页和搜索 - 在 AdminActivityController 中添加 list 接口,返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板,根据活动状态控制按钮显示

---
 src/main/resources/mapper/modules/MallGoodsMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 20c4977..69120e4 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -106,7 +106,7 @@
                 </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
@@ -123,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
@@ -170,6 +173,7 @@
         a.goods_introdution,
         a.unit,
         a.thumb,
+        a.is_sku,
         a.goods_details,
         a.is_sale,
         a.original_price,

--
Gitblit v1.9.1