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

shared/db/GVGUserItem.ts

@@ -2,6 +2,7 @@ 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 })
 export default class GVGUserItem extends BaseModel {
@@ -24,6 +25,9 @@ export default class GVGUserItem extends BaseModel {
     @prop({ required: true, default: 0 })
     expireTime: number; 
 
+    @prop({ required: true, default: 0 })
+    batchCode: 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();
         return result;
@@ -40,12 +44,13 @@ export default class GVGUserItem extends BaseModel {
     }
 
     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() } }
-            return { updateOne: { filter, update: { $inc: { count: -1 * count } } } }
+            return { updateOne: { filter, update: { $inc: { count: -1 * count }, $set: { batchCode } } } }
         }));
-        console.log(result.matchedCount, items.length)
-        return result.matchedCount == items.length;
+        const result: GVGUserItemType[] = await GVGUserItemModel.find({ batchCode }).lean();
+        return result;
     }
 
     public static async checkItemCnt(configId: number, leagueCode: string, roleId: string, id: number, count: number) {