Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
b1e3c9c488
@ -22,12 +22,15 @@ export class CrossEmailPull extends Scheduler {
|
||||
G.clientCross.callApi("email/GetCrossEmail", {server_id: G.config.serverId + ""}).then((res) => {
|
||||
if (!res.isSucc) return;
|
||||
res.res.emails.forEach(async (email) => {
|
||||
let _prize = email?.prizeData?.prize || [];
|
||||
if (email?.prizeData) delete email.prizeData;
|
||||
|
||||
email["prize"] = _prize;
|
||||
if (email.uid != "system") {
|
||||
await EmailFun.addEmail(email)
|
||||
} else {
|
||||
await EmailFun.addQuanFuEmail(email)
|
||||
}
|
||||
await EmailFun.addEmail(email)
|
||||
})
|
||||
if (res.res.emails.length > 0) {
|
||||
G.clientCross.callApi("email/DelCrossEmail", {eids: res.res.emails.map(e => e._id)})
|
||||
|
Loading…
Reference in New Issue
Block a user