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/MallOrderInfoMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 9799286..539929e 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -127,6 +127,7 @@
<result column="take_code" property="takeCode" />
<result column="take_unique_code" property="takeUniqueCode" />
<result column="delivery_state" property="deliveryState" />
+ <result column="delivery_state" property="deliveryState" />
<result column="is_home" property="isHome" />
<result column="is_free" property="isFree" />
<result column="del_flag" property="delFlag" />
@@ -157,6 +158,9 @@
<result property="memberInviteId" column="member_invite_id" />
<result property="memberCouponId" column="member_coupon_id" />
<result property="state" column="state" />
+ <result property="itemScoreAmount" column="item_score_amount" />
+ <result property="itemAmount" column="item_amount" />
+ <result property="itemScorePrice" column="item_score_price" />
</collection>
</resultMap>
@@ -204,11 +208,16 @@
b.cnt,
b.price,
b.amount,
+ b.amount as item_amount ,
+ b.score_amount as item_score_amount ,
+ FLOOR((c.original_price * d.static_prop)/100) as item_score_price ,
b.member_invite_id,
b.member_coupon_id,
b.is_normal
from mall_order_info a
- inner join mall_order_item b on a.id=b.order_id
+ left join mall_order_item b on a.id=b.order_id
+ left join mall_goods_sku c on c.id=b.sku_id
+ left join mall_goods d on d.id=b.goods_id
where a.id=#{id}
</select>
--
Gitblit v1.9.1