修改数据库表统一格式

shared/db/Role.ts

@@ -65,22 +65,22 @@ export default class Role extends BaseModel {
   @prop({ required: true, default: [] })
   consumeGoods: [{				// 消耗品
     id: number;						// id
-    cnt: number;					// 数量
+    count: number;					// 数量
   }];
   @prop({ required: true, default: [] })
   souls: [{								// 将魂
     id: number;						// 武将 id
-    cnt: number;					// 数量
+    count: number;					// 数量
   }];
   @prop({ required: true, default: [] })
   pieces: [{							// 装备碎片
     id: number;						// 装备 id
-    cnt: number;					// 数量
+    count: number;					// 数量
   }];
   @prop({ required: true, default: [] })
   jewels: [{							// 珠宝
     id: number;						// 待定，也可能是 type + lv
-    cnt: number;					// 数量
+    count: number;					// 数量
   }];
 
   @prop({ required: true, default: [] })
@@ -188,19 +188,28 @@ export default class Role extends BaseModel {
 
 
   public static async addItems(roleId: string, field: string, id: number, cnt: number, lean = true) {
-
+try {
+  let role = await RoleModel.findOne({roleId}).lean(lean);
+  let item = role[field];
+  let curItem = item.find(cur => cur.id == id);
+  if(!curItem) {
     let addToSet = {};
-    addToSet[field] = {id, cnt: 0};
-    await RoleModel.findOneAndUpdate({roleId}, { $addToSet: addToSet }, { "new": true, "upsert": true});
-
+    addToSet[field] = {id, count: cnt};
+    let result = await RoleModel.findOneAndUpdate({roleId}, { $addToSet: addToSet }, { "new": true, "upsert": true}).lean(lean);  
+    return result;
+  } else {
     let condition = { roleId };
     condition[`${field}.id`] = id;
     let update = {};
-    update[`${field}.$.cnt`] = cnt;
+    update[`${field}.$.count`] = cnt;
 
     let result = await RoleModel.findOneAndUpdate(condition, { $inc: update }, { "new": true, "upsert": true}).lean(lean);
     return result;
   }
+}catch(e) {
+  console.error(e)
+}
+  }
 
   public static async addCoin(roleId: string, cnt: number, lean = true) {
     let result = await RoleModel.findOneAndUpdate({roleId}, { $inc: {coin: cnt} }, { "new": true, "upsert": true}).lean(lean);