xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(活动): 关注豪礼在玩家不是37账号时的逻辑

Browse Source
This commit is contained in:
luying
2023-04-06 15:48:15 +08:00
parent 4a32270297
commit b28b3638a2
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activity/bindPhoneService.ts
+13 -11
View File
@@ -40,11 +40,12 @@ export async function getAllSnsLinkData(activityId: number, roleId: string, serv
} }
if(playerData.wxPublicAccount) { if(playerData.wxPublicAccount) {
if(!user) user = await UserModel.findUserByUid(uid); if(!user) user = await UserModel.findUserByUid(uid);
if(!user.channelInfo) return null; if(user.channelInfo) {
let giftCode = encodeGiftCode(roleId, serverId, user.channelInfo.uid, user.channelInfo.platformAppid, user.channelInfo.childGameId, activityId); let giftCode = encodeGiftCode(roleId, serverId, user.channelInfo.uid, user.channelInfo.platformAppid, user.channelInfo.childGameId, activityId);
playerData.wxPublicAccount.setEncodeGiftCode(giftCode); playerData.wxPublicAccount.setEncodeGiftCode(giftCode);
let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, user.channelId); let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, user.channelId);
if(playerRecord) playerData.wxPublicAccount.setPlayerRecord(playerRecord); if(playerRecord) playerData.wxPublicAccount.setPlayerRecord(playerRecord);
}
} }
return playerData; return playerData;
@@ -101,11 +102,12 @@ export async function getPublicAccountData(activityId: number, roleId: string, s
playerData.setLinks(links); playerData.setLinks(links);
if(playerData.wxPublicAccount) { if(playerData.wxPublicAccount) {
if(!user.channelInfo) return null; if(user.channelInfo) {
let giftCode = encodeGiftCode(roleId, serverId, user.channelInfo.uid, user.channelInfo.platformAppid, user.channelInfo.childGameId, activityId); let giftCode = encodeGiftCode(roleId, serverId, user.channelInfo.uid, user.channelInfo.platformAppid, user.channelInfo.childGameId, activityId);
playerData.wxPublicAccount.setEncodeGiftCode(giftCode); playerData.wxPublicAccount.setEncodeGiftCode(giftCode);
let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, user.channelId); let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, user.channelId);
if(playerRecord) playerData.wxPublicAccount.setPlayerRecord(playerRecord); if(playerRecord) playerData.wxPublicAccount.setPlayerRecord(playerRecord);
}
} }
return playerData; return playerData;
@@ -139,7 +141,7 @@ export async function sendPublicAccountGift(message: string) {
if(!isNumber(activityId) || !userCode || !channelId) return; if(!isNumber(activityId) || !userCode || !channelId) return;
let onlineRoleId = await getOnlineRoleByUserCode(userCode); let onlineRoleId = await getOnlineRoleByUserCode(userCode);
console.log('##### sendPublicAccountGift', message, userCode, onlineRoleId); // console.log('##### sendPublicAccountGift', message, userCode, onlineRoleId);
if (!!onlineRoleId) { // 在线，推送消息 if (!!onlineRoleId) { // 在线，推送消息
let playerRecord = await ActivityPublicAccountCodeModel.findByChannel(activityId, channelId); 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 }); 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 });
game-server/app/services/activity/weeklyFundService.ts
+1 -1
View File
@@ -34,7 +34,7 @@ export async function getWeeklyFundData(activityId: number, serverId: number, ro
*/ */
export async function getWeeklyFundDataShow(activityId: number, serverId: number, roleId: string) { export async function getWeeklyFundDataShow(activityId: number, serverId: number, roleId: string) {
let playerData = await getWeeklyFundData(activityId, serverId, roleId); let playerData = await getWeeklyFundData(activityId, serverId, roleId);
console.log('##### weeklyFund', playerData) // console.log('##### weeklyFund', playerData)
if(playerData && playerData.canShow && playerData.canShow()) { if(playerData && playerData.canShow && playerData.canShow()) {
return playerData.getShowResult(); return playerData.getShowResult();
} }