From e64c6b5756e9f96a864c042a5a3303e152efb299 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 24 Apr 2025 17:47:15 +0800
Subject: [PATCH] fix(mall): 修复订单可能为空导致的空指针异常 - 在处理订单状态更新之前，增加了对订单对象是否为空的判断 - 如果订单对象为空，则直接返回，避免执行后续操作时出现空指针异常
---
src/main/resources/mapper/modules/HappyActivityOptionMapper.xml | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
index be37767..dd13bc2 100644
--- a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -8,6 +8,7 @@
a.address,
a.index_img,
a.code,
+ a.type,
a.name,
a.state,
a.join_cnt,
@@ -62,4 +63,29 @@
order by a.order_cnt asc
</select>
+ <select id="selectOrderInPage" resultType="cc.mrbird.febs.mall.entity.HappyActivityOrder">
+ select
+ a.*,
+ b.name as name,
+ c.name as activityName
+ from happy_activity_order a
+ left join mall_member b on a.member_id = b.id
+ left join happy_activity c on a.activity_id = c.id
+ <where>
+ and a.DELETE_FLAG = 0
+ <if test="record != null">
+ <if test="record.name != null and record.name != ''">
+ and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ <if test="record.state != null">
+ and a.state=#{record.state}
+ </if>
+ <if test="record.activityId != null">
+ and a.activity_id=#{record.activityId}
+ </if>
+ </if>
+ </where>
+ order by a.id desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1