From eaac429281b5dd3f8af2b4a35bbdffd0742810d6 Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Sat, 20 Sep 2025 14:13:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=85=85=E5=80=BC=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../h5/ActivityH5AwardRecordServiceImpl.java      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5AwardRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5AwardRecordServiceImpl.java
index 0e05f11b0..68f7faf97 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5AwardRecordServiceImpl.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5AwardRecordServiceImpl.java
@@ -6,7 +6,6 @@ import com.accompany.business.common.dto.RewardDto;
 import com.accompany.business.common.vo.RewardVo;
 import com.accompany.business.constant.activity.ActivityH5RedisKey;
 import com.accompany.business.constant.activity.ActivityRewardStatus;
-import com.accompany.business.constant.activity.ActivitySkipType;
 import com.accompany.business.constant.activity.ActivityType;
 import com.accompany.business.model.activity.h5.ActivityH5AwardRecord;
 import com.accompany.business.model.activity.h5.ActivityH5LevelAward;
@@ -69,7 +68,7 @@ public class ActivityH5AwardRecordServiceImpl extends ServiceImpl<ActivityH5Awar
 
     @Override
     public void sendAward(ActivityType activityType, Integer partitionId, Long uid, Integer level, String date) {
-        this.baseSendAward(activityType, partitionId, uid, level, date, null, null, null);
+        this.baseSendAward(activityType, partitionId, uid, level, date, null, null);
     }
 
     @Override
@@ -79,7 +78,7 @@ public class ActivityH5AwardRecordServiceImpl extends ServiceImpl<ActivityH5Awar
         boolean added = set.add(level);
         set.expire(statusCacheDay, TimeUnit.DAYS);
         if (added) {
-            this.baseSendAward(activityType, partitionId, uid, level, date, null, null, null);
+            this.baseSendAward(activityType, partitionId, uid, level, date, null, null);
             return Boolean.TRUE;
         }
         return Boolean.FALSE;
@@ -93,19 +92,19 @@ public class ActivityH5AwardRecordServiceImpl extends ServiceImpl<ActivityH5Awar
         boolean added = set.add(level);
         set.expire(statusCacheDay, TimeUnit.DAYS);
         if (added) {
-            this.baseSendAward(activityType, partitionId, uid, level, date, null, null, goldBillObjType);
+            this.baseSendAward(activityType, partitionId, uid, level, date, null, goldBillObjType);
             return Boolean.TRUE;
         }
         return Boolean.FALSE;
     }
 
     private void baseSendAward(ActivityType activityType, Integer partitionId, Long uid,
-                          Integer level, String date, ActivitySkipType activitySkipType, String message, BillObjTypeEnum goldBillObjType) {
+                          Integer level, String date, String message, BillObjTypeEnum goldBillObjType) {
         ActivityH5LevelExp activityH5LevelExp = activityH5LevelExpService.getLevelExp(partitionId, level, activityType.getType());
         List<ActivityH5LevelAward> activityH5LevelAwards = activityH5LevelAwardService.listByLevelPartition(partitionId, level, activityType.getType());
         if (CollectionUtils.isEmpty(activityH5LevelAwards)) {
-            log.info("h5SendAward-empty,ActivityType:{},uid:{},level:{},date:{},activitySkipType:{},message:{}",
-                    activityType.getName(), uid, level, date, activitySkipType, message);
+            log.info("h5SendAward-empty,ActivityType:{},uid:{},level:{},date::{},message:{}",
+                    activityType.getName(), uid, level, date, message);
             return;
         }
         for (ActivityH5LevelAward award : activityH5LevelAwards) {
@@ -117,7 +116,7 @@ public class ActivityH5AwardRecordServiceImpl extends ServiceImpl<ActivityH5Awar
         if (StringUtils.isBlank(message) && activityH5LevelExp != null) {
             message = getMessage(uid, activityH5LevelExp);
         }
-        if (StringUtils.isNotEmpty(message) && ActivitySkipType.normal == activitySkipType) {
+        if (StringUtils.isNotEmpty(message)) {
             baseSendService.sendsecretaryMsg(uid, message);
         }
     }