🐞 fix(gvg): 批量保存数据后返回有时无法查询

This commit is contained in:
luying
2023-02-18 17:30:49 +08:00
parent cbbacd27b5
commit 8065a81988
3 changed files with 26 additions and 37 deletions
+6 -12
View File
@@ -2,10 +2,8 @@ import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { nowSeconds } from '../pubUtils/timeUtil';
import { RewardInter } from '../pubUtils/interface';
import { genCode } from '../pubUtils/util';
@index({ leagueCode: 1, roleId: 1, configId: 1, status: 1 })
@index({ batchCode: 1 })
export default class GVGUserItem extends BaseModel {
@prop({ required: true })
@@ -24,10 +22,7 @@ export default class GVGUserItem extends BaseModel {
count: number; // 数量
@prop({ required: true, default: 0 })
expireTime: number;
@prop({ required: true, default: 0 })
batchCode: string;
expireTime: number;
public static async findByRole(configId: number, leagueCode: string, roleId: string) {
const result: GVGUserItemType[] = await GVGUserItemModel.find({ configId, leagueCode, roleId, expireTime: { $gte: nowSeconds() } }, { _id: 0, id: 1, count: 1 }).lean();
@@ -45,12 +40,11 @@ export default class GVGUserItem extends BaseModel {
}
public static async decreaseItem(configId: number, leagueCode: string, roleId: string, items: RewardInter[]) {
let batchCode = genCode(10);
await GVGUserItemModel.bulkWrite(items.map(({ id, count }) => {
let filter = { configId, leagueCode, roleId, id, count: { $gte: count }, expireTime: { $gte: nowSeconds() } }
return { updateOne: { filter, update: { $inc: { count: -1 * count }, $set: { batchCode } } } }
}));
const result: GVGUserItemType[] = await GVGUserItemModel.find({ batchCode }).lean();
const result: GVGUserItemType[] = [];
for(let { id, count } of items) {
let item: GVGUserItemType = await GVGUserItemModel.findOneAndUpdate({ configId, leagueCode, roleId, id, count: { $gte: count }, expireTime: { $gte: nowSeconds() } }, { $inc: { count: -1 * count } }, { new: true }).lean();
if(item) result.push(item);
}
return result;
}