diff --git a/game-server/app/services/activity/bindPhoneService.ts b/game-server/app/services/activity/bindPhoneService.ts index bcd0d50f8..e98ecf96d 100644 --- a/game-server/app/services/activity/bindPhoneService.ts +++ b/game-server/app/services/activity/bindPhoneService.ts @@ -40,11 +40,12 @@ export async function getAllSnsLinkData(activityId: number, roleId: string, serv } if(playerData.wxPublicAccount) { if(!user) user = await UserModel.findUserByUid(uid); - if(!user.channelInfo) return null; - let giftCode = encodeGiftCode(roleId, serverId, user.channelInfo.uid, user.channelInfo.platformAppid, user.channelInfo.childGameId, activityId); - playerData.wxPublicAccount.setEncodeGiftCode(giftCode); - let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, user.channelId); - if(playerRecord) playerData.wxPublicAccount.setPlayerRecord(playerRecord); + if(user.channelInfo) { + let giftCode = encodeGiftCode(roleId, serverId, user.channelInfo.uid, user.channelInfo.platformAppid, user.channelInfo.childGameId, activityId); + playerData.wxPublicAccount.setEncodeGiftCode(giftCode); + let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, user.channelId); + if(playerRecord) playerData.wxPublicAccount.setPlayerRecord(playerRecord); + } } return playerData; @@ -101,11 +102,12 @@ export async function getPublicAccountData(activityId: number, roleId: string, s playerData.setLinks(links); if(playerData.wxPublicAccount) { - if(!user.channelInfo) return null; - let giftCode = encodeGiftCode(roleId, serverId, user.channelInfo.uid, user.channelInfo.platformAppid, user.channelInfo.childGameId, activityId); - playerData.wxPublicAccount.setEncodeGiftCode(giftCode); - let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, user.channelId); - if(playerRecord) playerData.wxPublicAccount.setPlayerRecord(playerRecord); + if(user.channelInfo) { + let giftCode = encodeGiftCode(roleId, serverId, user.channelInfo.uid, user.channelInfo.platformAppid, user.channelInfo.childGameId, activityId); + playerData.wxPublicAccount.setEncodeGiftCode(giftCode); + let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, user.channelId); + if(playerRecord) playerData.wxPublicAccount.setPlayerRecord(playerRecord); + } } return playerData; @@ -139,7 +141,7 @@ export async function sendPublicAccountGift(message: string) { if(!isNumber(activityId) || !userCode || !channelId) return; let onlineRoleId = await getOnlineRoleByUserCode(userCode); - console.log('##### sendPublicAccountGift', message, userCode, onlineRoleId); + // console.log('##### sendPublicAccountGift', message, userCode, onlineRoleId); if (!!onlineRoleId) { // 在线,推送消息 let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, channelId); await sendMessageToUserWithSuc(onlineRoleId, PUSH_ROUTE.PUBLIC_ACCOUNT_GIFT, { activityId, type: SNS_LINK_TYPE.WX_PUBLIC_ACCOUNT, status: playerRecord.hasReceived? BIND_PHONE_STATUS.RECEIVED: BIND_PHONE_STATUS.HAS_BIND }); diff --git a/game-server/app/services/activity/weeklyFundService.ts b/game-server/app/services/activity/weeklyFundService.ts index cd95fc9bc..621f4c7b0 100644 --- a/game-server/app/services/activity/weeklyFundService.ts +++ b/game-server/app/services/activity/weeklyFundService.ts @@ -34,7 +34,7 @@ export async function getWeeklyFundData(activityId: number, serverId: number, ro */ export async function getWeeklyFundDataShow(activityId: number, serverId: number, roleId: string) { let playerData = await getWeeklyFundData(activityId, serverId, roleId); - console.log('##### weeklyFund', playerData) + // console.log('##### weeklyFund', playerData) if(playerData && playerData.canShow && playerData.canShow()) { return playerData.getShowResult(); }