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/MallRefundMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallRefundMapper.xml b/src/main/resources/mapper/modules/MallRefundMapper.xml
index 97551cf..5bb7a9b 100644
--- a/src/main/resources/mapper/modules/MallRefundMapper.xml
+++ b/src/main/resources/mapper/modules/MallRefundMapper.xml
@@ -25,18 +25,29 @@
<select id="getOrderRefundListInPage" resultType="cc.mrbird.febs.mall.entity.MallRefundEntity">
select a.*,
+ b.order_time orderTime,
b.order_no orderNo,
b.status,
+ c.id itemId,
c.goods_name goodsName,
- c.cnt
+ c.cnt,
+ d.name refundMemberName,
+ d.phone refundMemberPhone
from mall_refund a
inner join mall_order_info b on a.order_id = b.id
inner join mall_order_item c on a.item_id = c.id
+ inner join mall_member d on a.member_id = d.id
<where>
<if test="record != null" >
<if test="record.state!=null and record.state!=''">
and a.state = #{record.state}
</if>
+ <if test="record.refundMemberName!=null and record.refundMemberName!=''">
+ and d.name like concat('%',#{record.refundMemberName},'%')
+ </if>
+ <if test="record.refundMemberPhone!=null and record.refundMemberPhone!=''">
+ and d.phone like concat('%',#{record.refundMemberPhone},'%')
+ </if>
</if>
</where>
order by a.CREATED_TIME desc
--
Gitblit v1.9.1