结算获取消耗品和金币

2020-10-21 16:48:54 +08:00
parent aa0b2ba9ee
commit 3d031088b7
12 changed files with 3678 additions and 1497 deletions
@@ -232,7 +232,7 @@ export class ExpeditionBattleHandler {
                expeditionCode, expeditionId,
                battleCode, battleId, 
                battleStatus: expeditionWarRecord.battleStatus,
-                goods: reward,
+                ...reward,
                apJson,
                expeditionPoint 
        });
@@ -273,7 +273,7 @@ export class ExpeditionBattleHandler {
        return resResult(STATUS.SUCCESS, {
                expeditionCode, expeditionId,
                battleId, battleCode, battleStatus, received,
-                goods
+                ...goods
        });

    }
@@ -315,7 +315,7 @@ export class ExpeditionBattleHandler {

        return resResult(STATUS.SUCCESS, {
            pointRewards,
-            goods
+            ...goods
        })
    }