From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 6bc8228..84b0c3f 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -5,6 +5,8 @@
<resultMap id="MallGoodsMap" type="cc.mrbird.febs.mall.entity.MallGoods">
<id property="id" column="id" />
<result property="goodsNo" column="goods_no" />
+ <result property="storeAppId" column="store_app_id" />
+ <result property="storeGoodsId" column="store_goods_id" />
<result property="goodsName" column="goods_name" />
<result property="goodsIntrodution" column="goods_introdution" />
<result property="unit" column="unit" />
@@ -42,6 +44,7 @@
<result property="stock" column="sku_stock" />
<result property="skuVolume" column="sku_volume" />
<result property="originalPrice" column="sku_original_price" />
+ <result property="staticPropPrice" column="sku_static_prop_price" />
<result property="presentPrice" column="sku_present_price" />
<result property="styleId" column="sku_style_id"/>
<result property="goodsId" column="sku_goods_id" />
@@ -67,11 +70,12 @@
c.stock sku_stock,
c.sku_volume,
c.original_price sku_original_price,
- a.original_price*a.static_prop staticPropPrice,
+ FLOOR((a.original_price * a.static_prop)/100) staticPropPrice,
c.present_price sku_present_price,
c.style_id sku_style_id,
c.goods_weight sku_goods_weight,
c.sample sample,
+ FLOOR((c.original_price*a.static_prop)/100) sku_static_prop_price,
c.level_one_price sku_level_one_price,
c.level_two_price sku_level_two_price,
c.level_three_price sku_level_three_price,
@@ -92,7 +96,7 @@
a.thumb,
a.unit,
a.original_price,
- a.original_price*a.static_prop staticPropPrice,
+ FLOOR((a.original_price * a.static_prop)/100) staticPropPrice,
a.present_price,
a.level_one_price,
a.level_two_price,
@@ -127,7 +131,7 @@
and a.is_normal = #{record.isNormal}
</if>
<if test="record.goodsType != null and record.goodsType != '' and record.goodsType == 1">
- and a.goods_type = #{record.goodsType} and a.present_price != 0
+ and a.goods_type = #{record.goodsType}
</if>
<if test="record.goodsType != null and record.goodsType != '' and record.goodsType == 2">
and a.goods_type = #{record.goodsType}
@@ -269,6 +273,7 @@
from mall_goods_comment a
left join mall_member b on b.id = a.member_id
<where>
+ and a.show_state =1
<if test="record != null">
<if test="record.goodsId != null and record.goodsId != ''">
and a.goods_id=#{record.goodsId}
@@ -301,10 +306,10 @@
<select id="findMallGoodsCommentLevelByGoodsId" resultType="cc.mrbird.febs.mall.vo.MallGoodsCommentVo">
select
- (select count(z.id) from mall_goods_comment z where z.goods_id = #{id} and z.star <![CDATA[ > ]]> 4) greatNum,
+ (select count(z.id) from mall_goods_comment z where z.goods_id = #{id} and z.star <![CDATA[ > ]]> 4 and z.show_state = 1) greatNum,
(select count(z.id) from mall_goods_comment z where z.goods_id = #{id}
- and (z.star <![CDATA[ >= ]]> 3 and z.star <![CDATA[ <= ]]> 4)) goodNum,
- (select count(z.id) from mall_goods_comment z where z.goods_id = #{id} and (z.star <![CDATA[ < ]]> 3 )) badNum
+ and (z.star <![CDATA[ >= ]]> 3 and z.star <![CDATA[ <= ]]> 4) and z.show_state = 1) goodNum,
+ (select count(z.id) from mall_goods_comment z where z.goods_id = #{id} and (z.star <![CDATA[ < ]]> 3 ) and z.show_state = 1) badNum
from mall_goods_comment a limit 1
</select>
@@ -339,11 +344,13 @@
select
a.id,
a.goods_name,
+ a.store_app_id,
+ a.store_goods_id,
a.goods_introdution goodsIntroduction,
a.thumb,
a.unit,
a.original_price,
- a.original_price*a.static_prop staticPropPrice,
+ FLOOR((a.original_price * a.static_prop)/100) staticPropPrice,
a.present_price,
a.score,
a.is_hot,
@@ -369,7 +376,7 @@
and a.is_normal = #{record.isNormal}
</if>
<if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
- and a.goods_type = #{record.goodsType} and a.present_price != 0
+ and a.goods_type = #{record.goodsType}
</if>
<if test="record.goodsType == 3">
and a.present_price = 0
--
Gitblit v1.9.1