diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/MyFamilyApplyListExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/MyFamilyApplyListExe.java index b01a66af..6e4eac9a 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/MyFamilyApplyListExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/MyFamilyApplyListExe.java @@ -56,14 +56,18 @@ public class MyFamilyApplyListExe { return msgList.stream().map(msg -> { FamilyDetailsDTO familyDetails = familyCommon.getFamilyDetails(msg.getSysOrigin(), msg.getFamilyId()); + if (familyDetails == null) { + return null; + } return new MyFamilyApplyCO() .setMsgId(msg.getId()) .setFamilyId(msg.getFamilyId()) - .setFamilyName(familyDetails != null ? familyDetails.getFamilyName() : "") - .setFamilyAvatar(familyDetails != null ? familyDetails.getFamilyAvatar() : "") - .setMaxMember(familyDetails != null ? familyDetails.getMaxMember() : 0) + .setFamilyAccount(familyDetails.getFamilyAccount()) + .setFamilyName(familyDetails.getFamilyName()) + .setFamilyAvatar(familyDetails.getFamilyAvatar()) + .setMaxMember(familyDetails.getMaxMember()) .setStatus(msg.getStatus()) .setCreateTime(msg.getCreateTime()); - }).toList(); + }).filter(Objects::nonNull).toList(); } } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java index 3a950850..49992b9e 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java @@ -304,9 +304,6 @@ public class WeeklyRewardsSentManager { userIndex + 1, user.getUserId(), user.getQuantity()); continue; } - if (user.getUserId().equals(1997061185894658049L)) { - continue; - } // 发送奖励 sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(), @@ -323,7 +320,7 @@ public class WeeklyRewardsSentManager { } private static boolean isKingGames(ActivityConfigDTO activityConfigDTO) { - return RankingActivityType.KING_GAMES.getCode().equals(Integer.parseInt(activityConfigDTO.getActivityType())); + return RankingActivityType.KING_GAMES.name().equals(activityConfigDTO.getActivityType()); } /** diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/MyFamilyApplyCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/MyFamilyApplyCO.java index a3738265..79477fb8 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/MyFamilyApplyCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/MyFamilyApplyCO.java @@ -22,6 +22,9 @@ public class MyFamilyApplyCO { */ private Long familyId; + + private String familyAccount; + /** * 家族名称. */ diff --git a/rc-service/rc-service-other/other-start/src/test/java/DailTaskTest.java b/rc-service/rc-service-other/other-start/src/test/java/DailTaskTest.java index 5e3b0217..77ea6ef9 100644 --- a/rc-service/rc-service-other/other-start/src/test/java/DailTaskTest.java +++ b/rc-service/rc-service-other/other-start/src/test/java/DailTaskTest.java @@ -19,8 +19,8 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) public class DailTaskTest { - @Autowired - private DailyTask dailyTask; +// @Autowired +// private DailyTask dailyTask; @Autowired private RankingActivityRewardTask rankingActivityRewardTask; @Autowired @@ -29,17 +29,17 @@ public class DailTaskTest { private PropsActivityClient propsActivityClient; @Autowired private CleanExpiredDismissingCpTask cleanExpiredDismissingCpTask; - @Autowired - private GameKingRewardTask gameKingRewardTask; +// @Autowired +// private GameKingRewardTask gameKingRewardTask; @Test public void testGameKing() { - gameKingRewardTask.executeGameKingReward(); +// gameKingRewardTask.executeGameKingReward(); } @Test public void DailTaskTest() { - dailyTask. nobleDailyGoldRewardTask(); +// dailyTask. nobleDailyGoldRewardTask(); } @Test