合成藏宝图，消耗品单独开表

game-server/app/services/rewardService.ts

@@ -5,6 +5,7 @@ import { decodeStr } from '../pubUtils/util';
 import { getGoodById } from '../pubUtils/gamedata';
 import { RoleModel } from '../db/Role';
 import { setAp } from './actionPointService';
+import { ItemModel } from '../db/Item';
 
 export async function handleFixedReward(roleId: string, roleName: string, rewardStr: string, multi: number) {
     let reward = decodeStr('fixReward', rewardStr);
@@ -15,7 +16,7 @@ export async function handleFixedReward(roleId: string, roleName: string, reward
     return result;
 }
 
-export async function handleReward(roleId: string, roleName: string, rewards: Array<{type: number, gid: number, count: number, times: number}>) {
+export async function handleReward(roleId: string, roleName: string, rewards: Array<{type?: number, gid: number, count: number, times?: number}>) {
 
     let returnGoods = new Array(), getGold = 0, getCoin = 0, getAp = 0;
     for(let goods of rewards) {
@@ -24,11 +25,11 @@ export async function handleReward(roleId: string, roleName: string, rewards: Ar
         if(goodInfo.goodType == GOOD_TYPE.EQUIP) { // 装备
             result = await rewardWeapons(roleId, roleName, goodInfo, {id: goods.gid, cnt: goods.count });
         } else if(goodInfo.goodType == GOOD_TYPE.CONSUMES|| goodInfo.goodType == GOOD_TYPE.SCRIPT) { // 消耗品
-            let {field, isCurrency} = ITID.get(goodInfo.itid);
+            let {type, isCurrency} = ITID.get(goodInfo.itid);
             if(isCurrency) { // 货币
                 result = await rewardCurrency(roleId, goodInfo, {id: goods.gid, cnt: goods.count });
             } else {
-                result = await rewardItems(roleId, goodInfo, field, {id: goods.gid, cnt: goods.count });
+                result = await rewardItems(roleId, roleName, goodInfo, type, {id: goods.gid, cnt: goods.count });
             }
         }
 
@@ -76,20 +77,22 @@ async function rewardWeapons (roleId: string, roleName: string, dicGood: any,  w
 }
 
 // 消耗品
-async function rewardItems (roleId: string, dicGood: any, field: string, data: {id:number,cnt:number }) {
+async function rewardItems (roleId: string, roleName: string, dicGood: any, type: number, data: {id:number,cnt:number }) {
 
     let goods = new Array();
     let {id, cnt} = data;
 
-    let result = await RoleModel.addItems(roleId, field, id, cnt);
+    let result = await ItemModel.increaseItem(roleId, id, cnt, {roleId, roleName, itemName: dicGood.name, id, type, hid: dicGood.hid||0});
     
-    goods.push({
-        id: id,
-        name: dicGood.name,
-        count: cnt,
-        type: dicGood.goodType,
-        isCurrency: false
-    });
+    if(result) {
+        goods.push({
+            id: id,
+            name: dicGood.name,
+            count: cnt,
+            type: dicGood.goodType,
+            isCurrency: false
+        });
+    }
     return goods;
 }