Merge remote-tracking branch 'origin/bugfix' into bugfix

src/api_s2c/event/yuandan/ApiOpen.ts

@@ -3,14 +3,18 @@ import {ReqOpen, ResOpen} from "../../../shared/protocols/event/yuandan/PtlOpen"
 import {HuoDongFun} from "../../../public/huodongfun";
 import {PayFun} from "../../../public/pay";
 import {Yuandanfun} from "./fun";
+import {PublicShared} from "../../../shared/public/public";
 
 export default async function (call: ApiCall<ReqOpen, ResOpen>) {
     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 data = await Yuandanfun.getData(call, _hd.hdid)
+
     call.succ({
-        data: await Yuandanfun.getData(call, _hd.hdid),
-        payLog: await PayFun.getPayLogs(call.uid, payIds)
+        data: {...data, isSameDay: PublicShared.chkSameDate(data.qiandaoTime, G.time)},
+        payLog: await PayFun.getPayLogs(call.uid, payIds),
     })
 }

src/api_s2c/event/yuandan/fun.ts

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