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/MallOrderItemMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderItemMapper.xml b/src/main/resources/mapper/modules/MallOrderItemMapper.xml
index 60c211a..8bfdc43 100644
--- a/src/main/resources/mapper/modules/MallOrderItemMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderItemMapper.xml
@@ -8,9 +8,27 @@
where a.goods_id=#{goodsId} and b.member_id=#{memberId}
</select>
- <select id="selectListByStateAndOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+ <select id="selectItemBySkuIdUnCancel" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
select a.* from mall_order_item a
- where a.state=#{state} and b.order_id=#{orderId}
+ inner join mall_order_info b on a.order_id=b.ID and b.status in (1,2,3,4)
+ where a.sku_id = #{skuId} and b.member_id = #{memberId}
</select>
+ <select id="selectListByNotInStateAndOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+ select a.* from mall_order_item a
+ where a.state != #{state} and a.order_id=#{orderId}
+ </select>
+
+ <update id="updateStateByOrderId">
+ update mall_order_item
+ set state = #{state}
+ where order_id = #{orderId}
+ </update>
+
+ <select id="selectListByOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+ select a.* from mall_order_item a
+ where a.order_id=#{orderId}
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1