练兵接口调整，新增获得宝箱和战报

game-server/app/servers/battle/handler/guildRefineHandler.ts

@@ -15,6 +15,7 @@ import { checkAuth } from '../../../services/guildService';
 import { ARMY } from '../../../pubUtils/dicParam';
 import { CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts/constModules/itemConst';
 import { openGuildRefine } from '../../../services/guildRefineService';
+import { now } from 'moment';
 export default function (app: Application) {
     return new GuildRefineHandler(app);
 }
@@ -85,17 +86,23 @@ export class GuildRefineHandler {
         if (!!res.err) 
             return resResult(STATUS.REDLOCK_ERR); 
         let guildRefine = await GuildRefineModel.getRefine(code);
-        for (let scienceTree of  guildRefine.scienceTrees) {
+        let nowTime = nowSeconds();
+        for (let scienceTree of guildRefine.scienceTrees) {
             if (scienceTree.id == id) 
                 return resResult(STATUS.GUILD_LIGHT_UP_THE_SCIENCETREE);
             
-            if (scienceTree.endTime > nowSeconds()) 
+            if (scienceTree.endTime > nowTime) 
                 return resResult(STATUS.GUILD_SCIENCETREE_IS_RUNNING);
         }
+        for (let prePosition of developConsume.prePositions) {
+            let scienceTree = findWhere(guildRefine.scienceTrees, {id: prePosition});
+            if (!scienceTree||scienceTree.endTime > nowTime) 
+                return resResult(STATUS.GUILD_PERSITION_TREE_NOT_LIGHT);
+        }
         const costResult = await GuildModel.costFund(code, developConsume.fundConsume);
         if(!costResult) 
             return resResult(STATUS.GUILD_FUND_NOT_ENOUGH);
-        let scienceTree = { id, endTime: nowSeconds() + developConsume.timeConsume, assistRoleIds: []}
+        let scienceTree = { id, endTime: nowTime + developConsume.timeConsume, assistRoleIds: []}
         let { scienceTrees } = await GuildRefineModel.pushRefine(code, scienceTree);
         res.releaseCallback();
         return resResult(STATUS.SUCCESS, { scienceTrees });