xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(gvg): 修复消耗道具的推送

Browse Source
This commit is contained in:
luying
2023-02-08 20:18:24 +08:00
parent a19e2f64bd
commit 35778e97ce
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game-server/app/services/gvg/gvgItemService.ts
View File

@@ -71,7 +71,9 @@ export async function handleGVGCost(roleId: string, leagueCode: string, sid: str
if(!itemResult) return false; if(!itemResult) return false;
const decreaseResult = await GVGUserItemModel.decreaseItem(configId, leagueCode, roleId, leagueItems); const decreaseResult = await GVGUserItemModel.decreaseItem(configId, leagueCode, roleId, leagueItems);
return decreaseResult; const pushGoods = decreaseResult.map(item => ({ id: item.id, count: item.count, expireTime: item.expireTime }));
if(pushGoods.length > 0) await sendMessageToUserWithSuc(roleId, PUSH_ROUTE.LEAGUE_ITEM_UPDATE, { items: pushGoods }, sid);
return true;
} }
export function getProduceCoinCnt(items: RewardInter[]) { export function getProduceCoinCnt(items: RewardInter[]) {

13
shared/db/GVGUserItem.ts
View File

@@ -2,6 +2,7 @@ import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { nowSeconds } from '../pubUtils/timeUtil'; import { nowSeconds } from '../pubUtils/timeUtil';
import { RewardInter } from '../pubUtils/interface'; import { RewardInter } from '../pubUtils/interface';
import { genCode } from '../pubUtils/util';
@index({ leagueCode: 1, roleId: 1, configId: 1, status: 1 }) @index({ leagueCode: 1, roleId: 1, configId: 1, status: 1 })
export default class GVGUserItem extends BaseModel { export default class GVGUserItem extends BaseModel {
@@ -24,6 +25,9 @@ export default class GVGUserItem extends BaseModel {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
expireTime: number; expireTime: number;
@prop({ required: true, default: 0 })
batchCode: string;
public static async findByRole(configId: number, leagueCode: string, roleId: string) { 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(); const result: GVGUserItemType[] = await GVGUserItemModel.find({ configId, leagueCode, roleId, expireTime: { $gte: nowSeconds() } }, { _id: 0, id: 1, count: 1 }).lean();
return result; return result;
@@ -40,12 +44,13 @@ export default class GVGUserItem extends BaseModel {
} }
public static async decreaseItem(configId: number, leagueCode: string, roleId: string, items: RewardInter[]) { public static async decreaseItem(configId: number, leagueCode: string, roleId: string, items: RewardInter[]) {
const result = await GVGUserItemModel.bulkWrite(items.map(({ id, count }) => { let batchCode = genCode(10);
await GVGUserItemModel.bulkWrite(items.map(({ id, count }) => {
let filter = { configId, leagueCode, roleId, id, count: { $gte: count }, expireTime: { $gte: nowSeconds() } } let filter = { configId, leagueCode, roleId, id, count: { $gte: count }, expireTime: { $gte: nowSeconds() } }
return { updateOne: { filter, update: { $inc: { count: -1 * count } } } } return { updateOne: { filter, update: { $inc: { count: -1 * count }, $set: { batchCode } } } }
})); }));
console.log(result.matchedCount, items.length) const result: GVGUserItemType[] = await GVGUserItemModel.find({ batchCode }).lean();
return result.matchedCount == items.length; return result;
} }
public static async checkItemCnt(configId: number, leagueCode: string, roleId: string, id: number, count: number) { public static async checkItemCnt(configId: number, leagueCode: string, roleId: string, id: number, count: number) {