From 8d3b2178fc1765f59406157a19f6183ef3a09c12 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 16:41:31 +0800 Subject: [PATCH] fix kuangdong --- src/api_s2c/kuangdong/ApiYanShi.ts | 22 ++++++++++++++-------- src/public/kuangdong.ts | 1 - 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/api_s2c/kuangdong/ApiYanShi.ts b/src/api_s2c/kuangdong/ApiYanShi.ts index f80c861..b19effd 100644 --- a/src/api_s2c/kuangdong/ApiYanShi.ts +++ b/src/api_s2c/kuangdong/ApiYanShi.ts @@ -1,24 +1,24 @@ -import { ApiCall } from "tsrpc"; -import { KuangDongfun } from "../../public/kuangdong"; -import { PlayerFun } from "../../public/player"; -import { ReqYanShi, ResYanShi } from "../../shared/protocols/kuangdong/PtlYanShi"; +import {ApiCall} from "tsrpc"; +import {KuangDongfun} from "../../public/kuangdong"; +import {PlayerFun} from "../../public/player"; +import {ReqYanShi, ResYanShi} from "../../shared/protocols/kuangdong/PtlYanShi"; export default async function (call: ApiCall) { let hdid = call.req.hdid let kdInfo = await KuangDongfun.getKaiCaiInfo(hdid) if (!kdInfo) { - return call.error('', { code: -1, message: globalThis.lng.kudangdong_1 }) + return call.error('', {code: -1, message: globalThis.lng.kudangdong_1}) } // 不是自己占领的 if (kdInfo.uid != call.uid) { - return call.error('', { code: -2, message: globalThis.lng.kudangdong_8 }) + return call.error('', {code: -2, message: globalThis.lng.kudangdong_8}) } // 已经延时 if (kdInfo.yanshi != 0) { - return call.error('', { code: -2, message: globalThis.lng.kudangdong_10 }) + return call.error('', {code: -2, message: globalThis.lng.kudangdong_10}) } // @ts-ignore @@ -30,7 +30,13 @@ export default async function (call: ApiCall) { _need && await PlayerFun.cutNeed(call, _need); kdInfo.yanshi = 8 * 3600 - await KuangDongfun.setminingZhanLing(call.uid, hdid, { $set: { yanshi: kdInfo.yanshi } }) + + // 如果调用这个方法,会upsert,在没有查到数据的情况下, + // 会插入空数据,全服玩家的查询列表接口都会报错 + // await KuangDongfun.setminingZhanLing(call.uid, hdid, { $set: { yanshi: kdInfo.yanshi } }) + await G.mongodb.collection('kuangdong').updateOne({uid: call.uid, hdid: hdid}, + {$set: {yanshi: kdInfo.yanshi}}); + kdInfo._id = kdInfo._id.toString() let changeData = { kdinfo: kdInfo diff --git a/src/public/kuangdong.ts b/src/public/kuangdong.ts index fe73d02..942759d 100644 --- a/src/public/kuangdong.ts +++ b/src/public/kuangdong.ts @@ -81,7 +81,6 @@ export class KuangDongfun { upsert: true } ); - } /**获取所有矿洞信息 */