moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

独联体-送礼小秘书消息

Browse Source
This commit is contained in:
hokli
2025-09-22 14:56:34 +08:00
parent c98ffef5ae
commit 82fe4f4c1c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5AwardRecordServiceImpl.java
View File

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