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/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
index d968a9f..cd9e132 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
@@ -1,8 +1,10 @@
 package cc.mrbird.febs.mall.mapper;
 
+import cc.mrbird.febs.mall.dto.activity.AdminHappyActivityOrderDto;
 import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionInPageDto;
 import cc.mrbird.febs.mall.entity.HappyActivity;
 import cc.mrbird.febs.mall.dto.ApiActivityInfoDto;
+import cc.mrbird.febs.mall.entity.HappyActivityOrder;
 import cc.mrbird.febs.mall.vo.ApiActivityInfoVo;
 import cc.mrbird.febs.mall.dto.ApiVoteRecordInPageDto;
 import cc.mrbird.febs.mall.vo.ApiActivityOptionListVo;
@@ -20,4 +22,6 @@
     void updateHappyActivityOptionLikeCnt(@Param("id")Long sourceOptionId);
 
     Page<ApiActivityOptionListVo> getVoteOptionInPage(Page<ApiActivityOptionListVo> page, @Param("record")ApiVoteOptionInPageDto dto);
+
+    Page<HappyActivityOrder> selectOrderInPage(Page<HappyActivityOrder> page, @Param("record")AdminHappyActivityOrderDto dto);
 }

--
Gitblit v1.9.1