hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

定时任务修复，新增familyAccount

Browse Source
This commit is contained in:
tianfeng 2025-12-29 11:54:57 +08:00
parent 5820d7fc74
commit d20e7cf6ff
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/MyFamilyApplyListExe.java
View File

@ -56,14 +56,18 @@ public class MyFamilyApplyListExe {
return msgList.stream().map(msg -> { return msgList.stream().map(msg -> {
FamilyDetailsDTO familyDetails = familyCommon.getFamilyDetails(msg.getSysOrigin(), msg.getFamilyId()); FamilyDetailsDTO familyDetails = familyCommon.getFamilyDetails(msg.getSysOrigin(), msg.getFamilyId());
if (familyDetails == null) {
return null;
}
return new MyFamilyApplyCO() return new MyFamilyApplyCO()
.setMsgId(msg.getId()) .setMsgId(msg.getId())
.setFamilyId(msg.getFamilyId()) .setFamilyId(msg.getFamilyId())
.setFamilyName(familyDetails != null ? familyDetails.getFamilyName() : "") .setFamilyAccount(familyDetails.getFamilyAccount())
.setFamilyAvatar(familyDetails != null ? familyDetails.getFamilyAvatar() : "") .setFamilyName(familyDetails.getFamilyName())
.setMaxMember(familyDetails != null ? familyDetails.getMaxMember() : 0) .setFamilyAvatar(familyDetails.getFamilyAvatar())
.setMaxMember(familyDetails.getMaxMember())
.setStatus(msg.getStatus()) .setStatus(msg.getStatus())
.setCreateTime(msg.getCreateTime()); .setCreateTime(msg.getCreateTime());
}).toList(); }).filter(Objects::nonNull).toList();
} }
} }

5
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java
View File

@ -304,9 +304,6 @@ public class WeeklyRewardsSentManager {
userIndex + 1, user.getUserId(), user.getQuantity()); userIndex + 1, user.getUserId(), user.getQuantity());
continue; continue;
} }
if (user.getUserId().equals(1997061185894658049L)) {
continue;
}
// 发送奖励 // 发送奖励
sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(), sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(),
@ -323,7 +320,7 @@ public class WeeklyRewardsSentManager {
} }
private static boolean isKingGames(ActivityConfigDTO activityConfigDTO) { private static boolean isKingGames(ActivityConfigDTO activityConfigDTO) {
return RankingActivityType.KING_GAMES.getCode().equals(Integer.parseInt(activityConfigDTO.getActivityType())); return RankingActivityType.KING_GAMES.name().equals(activityConfigDTO.getActivityType());
} }
/** /**

3
rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/MyFamilyApplyCO.java
View File

@ -22,6 +22,9 @@ public class MyFamilyApplyCO {
*/ */
private Long familyId; private Long familyId;
private String familyAccount;
/** /**
* 家族名称. * 家族名称.
*/ */

12
rc-service/rc-service-other/other-start/src/test/java/DailTaskTest.java
View File

@ -19,8 +19,8 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
public class DailTaskTest { public class DailTaskTest {
@Autowired // @Autowired
private DailyTask dailyTask; // private DailyTask dailyTask;
@Autowired @Autowired
private RankingActivityRewardTask rankingActivityRewardTask; private RankingActivityRewardTask rankingActivityRewardTask;
@Autowired @Autowired
@ -29,17 +29,17 @@ public class DailTaskTest {
private PropsActivityClient propsActivityClient; private PropsActivityClient propsActivityClient;
@Autowired @Autowired
private CleanExpiredDismissingCpTask cleanExpiredDismissingCpTask; private CleanExpiredDismissingCpTask cleanExpiredDismissingCpTask;
@Autowired // @Autowired
private GameKingRewardTask gameKingRewardTask; // private GameKingRewardTask gameKingRewardTask;
@Test @Test
public void testGameKing() { public void testGameKing() {
gameKingRewardTask.executeGameKingReward(); // gameKingRewardTask.executeGameKingReward();
} }
@Test @Test
public void DailTaskTest() { public void DailTaskTest() {
dailyTask. nobleDailyGoldRewardTask(); // dailyTask. nobleDailyGoldRewardTask();
} }
@Test @Test