Merge branch 'feature/huangqijiuguan' into dev
This commit is contained in:
commit
ffedca3574
@ -372,7 +372,9 @@ export default class HQJGFun {
|
||||
|
||||
let mydata = await this.getMydata(call, hd.hdid);
|
||||
|
||||
let isset = 0;
|
||||
if (!mydata.task.val[`day${today}`]) {
|
||||
isset = 1;
|
||||
mydata.task.val[`day${today}`] = {}
|
||||
for (let taskid in tasks) {
|
||||
let taskcon = tasks[taskid];
|
||||
@ -380,12 +382,6 @@ export default class HQJGFun {
|
||||
}
|
||||
}
|
||||
|
||||
let isset = 0;
|
||||
let setData = {
|
||||
$inc: {},
|
||||
$set: {}
|
||||
};
|
||||
|
||||
for (let taskid of Object.keys(tasks)) {
|
||||
let taskCon = tasks[taskid];
|
||||
if (taskCon.stype != stype) continue
|
||||
@ -397,18 +393,20 @@ export default class HQJGFun {
|
||||
val = await alchangeVal(call, taskCon, val, arg)
|
||||
|
||||
isset = 1
|
||||
if (isinc == 1) { // 累加
|
||||
mydata.task.val[`day${today}`][taskid] = (mydata.task.val[`day${today}`][taskid] || 0) + val
|
||||
setData["$inc"][`task.val.day${today}.${taskid}`] = val
|
||||
if (isinc != 1) { // 累加
|
||||
mydata.task.val[`day${today}`][taskid] = val;
|
||||
} else {
|
||||
mydata.task.val[`day${today}`][taskid] = val
|
||||
setData["$set"][`task.val.day${today}.${taskid}`] = val
|
||||
mydata.task.val[`day${today}`][taskid] = (mydata.task.val[`day${today}`][taskid] || 0) + val;
|
||||
}
|
||||
}
|
||||
|
||||
// 设置任务
|
||||
if (isset == 1) {
|
||||
await G.mongodb.collection('event').updateOne({ uid: call.uid, type: this.dataType(hd.hdid) }, setData)
|
||||
await G.mongodb.collection('event').updateOne({ uid: call.uid, type: this.dataType(hd.hdid) }, {
|
||||
$set: {
|
||||
[`task.val.day${today}`]: mydata.task.val[`day${today}`]
|
||||
}
|
||||
})
|
||||
|
||||
if ((await this.getHongDian(call, hd, mydata)).show) {
|
||||
G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])
|
||||
|
Loading…
Reference in New Issue
Block a user