From d5a0907b0bb734e13cae2092f3a004c30791a0e6 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 14:03:28 +0800
Subject: [PATCH] feat(mall): 添加活动模块 - 新增 ActivityServiceImpl 类实现活动服务 - 添加 AdminActivityController 和 ViewActivityController 控制器处理活动相关请求 - 创建 IActivityService 接口定义活动服务方法 - 设计 MallActivity 实体类表示活动信息 - 增加 MallActivityMapper 接口用于活动数据访问
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 2f0e915..69120e4 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,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
@@ -166,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