全局：加载json方法全部改为最新

shared/db/ComBattleTeam.ts

@@ -1,6 +1,7 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { EXTERIOR } from '../pubUtils/dicParam';
+import { ItemReward } from '../domain/dbGeneral';
 
 export class RoleStatus {
     @prop({ required: true })
@@ -48,8 +49,8 @@ export class RoleStatus {
     @prop({ required: true, default: false })
     gotReward: boolean;
     // 固定奖励
-    @prop({ required: true, default: '&' })
-    fixReward: string;
+    @prop({ required: true, default: [], type: ItemReward })
+    fixReward: ItemReward[];
     // 好友间伤害加成
     @prop({ required: true, default: 0 })
     frdRatio: number = 0;

shared/db/ExpeditionPoint.ts

@@ -1,6 +1,17 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { ItemReward } from '../domain/dbGeneral';
 
+class Reward {
+  @prop({ required: true })
+  point: number;
+  @prop({ required: true, type: ItemReward, default: [] })
+  reward: ItemReward[];
+  @prop({ required: true })
+  received: boolean;
+  @prop({ required: true })
+  recTime: Date;
+}
 /**
   * 远征记录
   */
@@ -14,15 +25,15 @@ export default class ExpeditionPoint extends BaseModel {
     pointCost: number;					 // 消耗点数
     @prop({ required: true, default: false })
     completed: boolean;					 // 本轮奖励是否完成
-    @prop({ required: true, default: [] })
-    rewards: Array<{point: number, reward: string, received:boolean, recTime: Date}>;                     // 领取记录
+    @prop({ required: true, type: Reward, default: [] })
+    rewards: Reward[];                     // 领取记录
 
     public static async getExpeditionPoint(roleId: string, lean = true) {
         const result: ExpeditionPointType = await ExpeditionPointModel.findOne({ roleId, completed: false }).lean(lean);
         return result;
     }
 
-    public static async updatePointStatus(roleId: string, point: number, reward: string, lean = true) {
+    public static async updatePointStatus(roleId: string, point: number, reward: ItemReward[], lean = true) {
       const result: ExpeditionPointType = await ExpeditionPointModel.findOneAndUpdate(
         { roleId, completed: false },
         { $set: { pointCost: point }, $push: {rewards:{point, reward, received: true, recTime: new Date()}}},