Authored by yyq

Merge branch 'release/0808' of git.yoho.cn:fe/yoho-activity-platform into release/0808

... ... @@ -56,10 +56,6 @@ class ShoesModel extends global.yoho.BaseModel {
friendId = friendInfo[0].id;
}
console.log(userId, friendId);
if (userId && friendId) {
// 插两条好友数据,互相为好友
let ufId = await mySqlCli.insert(strInsert_u, {userId, friendId, unionId, friendUnionId, actId});
... ... @@ -106,8 +102,6 @@ class ShoesModel extends global.yoho.BaseModel {
let strPlayed = `SELECT user_id, question_id, user_select_answer FROM ${TABLE_SHOES_ANSWER}
WHERE user_id = :userId AND act_id = :actId;`;
console.log(strPlayed);
let userInfo = await mySqlCli.query(strUser, {unionId});
let userId = 0;
... ... @@ -310,8 +304,6 @@ class ShoesModel extends global.yoho.BaseModel {
ON U.id = SF.friend_id WHERE SF.user_id = :userId
ORDER BY SF.create_time DESC;`;
// console.log(strSql.replace(':userId', userId));
let friendsInfo = await mySqlCli.query(strSql, {userId}); // 查询到所有好友信息
let friendsIds = [];
let friendList = [];
... ... @@ -351,7 +343,6 @@ class ShoesModel extends global.yoho.BaseModel {
record.failNum += 1;
}
for (let j = 0; j < friendsInfo.length; j++) {
console.log(friendId, friendsInfo[j].id);
if (friendId === friendsInfo[j].id) {
let friend_obj = {};
... ... @@ -394,12 +385,10 @@ class ShoesModel extends global.yoho.BaseModel {
order by count desc, playTime asc) A, (SELECT @rowNo := 0) B) C`;
console.log(strScore);
let scoreInfo = await mySqlCli.query(strScore, {
actId
});
console.log(scoreInfo);
let friendList = [];
if (scoreInfo && scoreInfo.length > 0) {
... ...