qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: qixin:a5ad7ee2cf81812b7086b45c280f9b475cca7df2
Branches Tags
qixin:dev
qixin:release
qixin:bugfix
qixin:feature/skin
qixin:feature/huangqijiuguan
qixin:master
qixin:feature/pushgift
qixin:feature/weiwang
qixin:feature/warning
qixin:feature/leichong
qixin:feature/xiaofeijingsai
...
compare: qixin:af0225005a3432e674e05ab13243db7704c065a1
Branches Tags
qixin:dev
qixin:release
qixin:bugfix
qixin:feature/skin
qixin:feature/huangqijiuguan
qixin:master
qixin:feature/pushgift
qixin:feature/weiwang
qixin:feature/warning
qixin:feature/leichong
qixin:feature/xiaofeijingsai

2 Commits
a5ad7ee2cf ... af0225005a

Author SHA1 Message Date
ciniao
af0225005a Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2023-12-18 18:02:15 +08:00
ciniao
3f275e4af4 去掉发邮件时的上限判断机制 2023-12-18 18:01:55 +08:00
1 changed files with 21 additions and 19 deletions
Show Stats Expand all files Collapse all files

40
src/public/email.ts
View File

@ -186,27 +186,29 @@ export class EmailFun {
sendEmail.lngContent = email.lngContent
}
if (!isCross) {
let emailList = await this.getAllEmail(uid);
if (emailList.length >= 50) {
emailList.sort((a, b) => {
let noPrizeA = a.prizeData == undefined ? 0 : 1;
let noPrizeB = b.prizeData == undefined ? 0 : 1;
let getA = a.prizeData?.isGet == true ? 0 : 1;
let getB = b.prizeData?.isGet == true ? 0 : 1;
//太亏了！换其他清理机制，getAllEmail是性能消耗大户
//todo.. 换其他清理机制
// if (!isCross) {
// let emailList = await this.getAllEmail(uid);
// if (emailList.length >= 50) {
// emailList.sort((a, b) => {
// let noPrizeA = a.prizeData == undefined ? 0 : 1;
// let noPrizeB = b.prizeData == undefined ? 0 : 1;
// let getA = a.prizeData?.isGet == true ? 0 : 1;
// let getB = b.prizeData?.isGet == true ? 0 : 1;
if (noPrizeA != noPrizeB) {
return noPrizeA - noPrizeB;
} else if (getA != getB) {
return getA - getB;
}
return a.createTime - b.createTime;
});
// if (noPrizeA != noPrizeB) {
// return noPrizeA - noPrizeB;
// } else if (getA != getB) {
// return getA - getB;
// }
// return a.createTime - b.createTime;
// });
this.removeEmail(uid, emailList[0]._id);
G.server.sendMsgByUid(uid, 'msg_s2c/EmailDel', emailList[0]._id);
}
}
// this.removeEmail(uid, emailList[0]._id);
// G.server.sendMsgByUid(uid, 'msg_s2c/EmailDel', emailList[0]._id);
// }
// }
let _id = (await G.mongodb.collection('email').insertOne({
ttl: new Date(), ...G.mongodb.conversionIdObj(sendEmail)