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

Merge branch 'bugfix' into dev

Browse Source
This commit is contained in:
dy 2023-12-30 10:43:31 +08:00
commit f6df6fd8bc
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api_s2c/event/yuandan/ApiOpen.ts
View File

@ -3,14 +3,18 @@ import {ReqOpen, ResOpen} from "../../../shared/protocols/event/yuandan/PtlOpen"
import {HuoDongFun} from "../../../public/huodongfun"; import {HuoDongFun} from "../../../public/huodongfun";
import {PayFun} from "../../../public/pay"; import {PayFun} from "../../../public/pay";
import {Yuandanfun} from "./fun"; import {Yuandanfun} from "./fun";
import {PublicShared} from "../../../shared/public/public";
export default async function (call: ApiCall<ReqOpen, ResOpen>) { export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let _hd = await Yuandanfun.getCon(call) let _hd = await Yuandanfun.getCon(call)
if (!_hd) return call.errorCode(-1)
let payIds = _hd.data.gift.filter(i => i.payid).map(i => i.payid) let payIds = _hd.data.gift.filter(i => i.payid).map(i => i.payid)
let data = await Yuandanfun.getData(call, _hd.hdid)
call.succ({ call.succ({
data: await Yuandanfun.getData(call, _hd.hdid), data: {...data, isSameDay: PublicShared.chkSameDate(data.qiandaoTime, G.time)},
payLog: await PayFun.getPayLogs(call.uid, payIds) payLog: await PayFun.getPayLogs(call.uid, payIds),
}) })
} }

12
src/api_s2c/event/yuandan/fun.ts
View File

@ -74,7 +74,8 @@ export class Yuandanfun {
let _hd = await this.getCon(call) let _hd = await this.getCon(call)
if (!_hd) return if (!_hd) return
// let _mydata = await Christmasfun.getMyData(call, hdid) await this.getData(call, _hd.hdid)
let _tasks = _hd.data.task let _tasks = _hd.data.task
let _setData = { let _setData = {
@ -88,7 +89,6 @@ export class Yuandanfun {
let _taskCon = _tasks[ele] let _taskCon = _tasks[ele]
if (_taskCon.stype != stype) continue if (_taskCon.stype != stype) continue
let _pval = _taskCon.pval
// 不符合任务要求 // 不符合任务要求
if (!(await chkCall(_taskCon["cond"], chkval, arg))) continue if (!(await chkCall(_taskCon["cond"], chkval, arg))) continue
@ -105,10 +105,10 @@ export class Yuandanfun {
// 设置任务 // 设置任务
if (isset == 1) { if (isset == 1) {
await G.mongodb.collection('event').updateOne( await G.mongodb.collection('event').updateOne({
{uid: call.uid, type: `yuandan${_hd.hdid}`}, uid: call.uid,
_setData type: `yuandan${_hd.hdid}`
) }, _setData)
} }
} }