From 66f7d87055501cf75cd71552ba1ceaf664f96c34 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 8 Feb 2023 20:27:20 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=86=9C=E5=9C=BA=E7=A7=8D=E5=AD=90=E6=9B=B4=E6=96=B0=E5=90=8E?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=A5=96=E5=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/db/GVGLeagueFarm.ts | 3 ++-
 shared/db/GVGUserItem.ts   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared/db/GVGLeagueFarm.ts b/shared/db/GVGLeagueFarm.ts
index 9dd479f13..2efd5e190 100644
--- a/shared/db/GVGLeagueFarm.ts
+++ b/shared/db/GVGLeagueFarm.ts
@@ -135,10 +135,11 @@ export default class GVGLeagueFarm extends BaseModel {
     public static async harvest(configId: number, leagueCode: string, farmId: number, fieldIds: number[], roleId: string) {
         const batchCode = genCode(10);
         const result = await GVGLeagueFarmModel.bulkWrite(fieldIds.map(fieldId => {
-            return { updateOne: { filter: { configId, leagueCode, farmId, fieldId, lockRoleId: roleId, harvestTime: { $lt: nowSeconds() } }, update: { $set: { unlockTime: 0, harvestTime: 0, seedType: 0, lockRoleId: '', lockRoleName: '', batchCode }} } }
+            return { updateOne: { filter: { configId, leagueCode, farmId, fieldId, lockRoleId: roleId, harvestTime: { $lt: nowSeconds() } }, update: { $set: { unlockTime: 0, harvestTime: 0, lockRoleId: '', lockRoleName: '', batchCode }} } }
         }));
         if(result.modifiedCount == 0) return [];
         const fieldResult: GVGLeagueFarmType[] = await GVGLeagueFarmModel.find({ batchCode }).sort({ fieldId: 1 }).select('-_id -createdAt -updatedAt -__v -configId -leagueCode').lean();
+        await GVGLeagueFarmModel.updateMany({ batchCode }, { $set: { seedType: 0 } })
         return fieldResult;
     }
 
diff --git a/shared/db/GVGUserItem.ts b/shared/db/GVGUserItem.ts
index b5e5e09da..21ed2d7a0 100644
--- a/shared/db/GVGUserItem.ts
+++ b/shared/db/GVGUserItem.ts
@@ -5,6 +5,7 @@ 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 })