fix bug 远征显示下一关等

shared/db/ExpeditionWarRecord.ts

@@ -67,7 +67,7 @@ export default class ExpeditionWarRecord extends BaseModel {
     ce: number;                // 敌军战力
 
     public static async getRecordByCode(expeditionCode: string, lean = true) {
-        const result = await ExpeditionWarRecordModel.find({ expeditionCode }).select('expeditionId battleId battleCode battleStatus ce').sort({expeditionId: 1}).lean(lean);
+        const result = await ExpeditionWarRecordModel.find({ expeditionCode, battleStatus: {$gte: 0} }).select('expeditionId battleId battleCode battleStatus ce').sort({expeditionId: 1}).lean(lean);
         return result;
     }
 
@@ -76,14 +76,19 @@ export default class ExpeditionWarRecord extends BaseModel {
         return result;
     }
     
-    public static async saveRecord(expeditionCode: string, expeditionId: number, params: {roleId: string, battleId: number, enemyFrom: number, enemyId: string, enemies: Array<any>}, lean = true) {
+    public static async saveRecord(expeditionCode: string, expeditionId: number, params: {roleId: string, battleId: number, enemyFrom: number, enemyId: string, enemies: Array<any>, battleStatus: number}, lean = true) {
         const doc = new ExpeditionWarRecordModel();
         const update = Object.assign(doc.toJSON(), params, {expeditionCode, expeditionId});
         const result = await ExpeditionWarRecordModel.findOneAndUpdate({ expeditionCode, expeditionId }, update, {new: true, upsert: true}).select('expeditionId battleId battleCode battleStatus enemyFrom enemies ce').lean(lean);
         return result;
     }
     
-    public static async updateStatus(expeditionCode: string, expeditionId: number, battleStatus: number, battleCode: string, lean = true) {
+    public static async updateStatus(expeditionCode: string, expeditionId: number, battleStatus: number, lean = true) {
+        const result = await ExpeditionWarRecordModel.findOneAndUpdate({ expeditionCode, expeditionId }, {battleStatus}, {new: true}).lean(lean);
+        return result;
+    }
+
+    public static async updateBattleCode(expeditionCode: string, expeditionId: number, battleStatus: number, battleCode: string, lean = true) {
         const result = await ExpeditionWarRecordModel.findOneAndUpdate({ expeditionCode, expeditionId }, {battleStatus, battleCode}, {new: true}).lean(lean);
         return result;
     }