diff --git a/laf-cloud/functions/login.ts b/laf-cloud/functions/login.ts index fd4c399..12c237d 100644 --- a/laf-cloud/functions/login.ts +++ b/laf-cloud/functions/login.ts @@ -18,6 +18,8 @@ const mchid = "1719895437";//商户id const serialNo = "2A97ED6ED441E55600EBC8830B9EC889ED41496E";//证书序列号 const ThinkingData = require('thinkingdata-node'); import Ip2region from 'ip2region'; +// 新版每日/周任务暂不上线,仅保留源码备查(743ea34 引入,local 分支保留)。 +// import { refreshTaskData } from "@/dailyTaskService"; const query = new Ip2region(); const canIos = false; const version = "9.9.99"; @@ -174,6 +176,14 @@ export default async function (ctx: FunctionContext) { abTests = await getActiveABAssignments(openid, userData.abTests, false); shouldPersistABTests = JSON.stringify(userData.abTests) !== JSON.stringify(abTests); } + /* 新版每日/周任务暂不执行;启用时需替换下方旧版逻辑并配套客户端。 + const task = refreshTaskData( + userData.task, + userData._id, + Number(userData.levelAmount) + 1 || 1, + ).data; + */ + // 当前上线使用旧版四项任务逻辑:743ea34 之前的实现,8e4a978 已恢复。 let taskTime = userData.taskTime || 0; let task = userData.task; if (task) { @@ -214,6 +224,7 @@ export default async function (ctx: FunctionContext) { isDebug: isDebug, isFirst: false, task: JSON.stringify(task), + // 新版配套时间写法(暂不执行):taskTime: Date.now(), taskTime: Date.now() + 8 * 3600000, token: token, ...migrationUpdate, @@ -243,6 +254,21 @@ export default async function (ctx: FunctionContext) { } await delayExecution(0.1); userData = await getUserData(dbname, openid); + /* 新版每日/周任务登录后补齐逻辑暂不执行,避免将旧账号任务改写为 V2。 + const ensuredTask = refreshTaskData( + userData.task, + userData._id, + Number(userData.levelAmount) + 1 || 1, + ); + if (ensuredTask.changed) { + userData.task = JSON.stringify(ensuredTask.data); + userData.taskTime = Date.now(); + await db.collection(dbname).where({ _id: userData._id }).update({ + task: userData.task, + taskTime: userData.taskTime, + }); + } + */ let outTradeNo: any = []; if (!isNewUser) { let res = null;