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/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java b/src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java
index c5cc4c2..7030df2 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/HappyActivityOrder.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.mall.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -26,6 +27,7 @@
`pay_order_no` text COMMENT '支付订单号',
`wx_order_no` varchar(100) DEFAULT NULL COMMENT '微信订单编号',
`state` int(11) DEFAULT '1' COMMENT '订单状态 1-待支付 2-待使用 3-已使用 4-售后',
+ `fail_time` datetime DEFAULT NULL COMMENT '失效时间',
*/
@@ -42,4 +44,12 @@
private String payOrderNo;
private String wxOrderNo;
private Integer state;
+ private Date failTime;
+
+
+ @TableField(exist = false)
+ private String name;//
+
+ @TableField(exist = false)
+ private String activityName;//
}
--
Gitblit v1.9.1