GM后台修改status code

gm-server/app/service/users.ts

@@ -7,6 +7,7 @@ import { CounterModel } from '@db/Counter';
 
 import { Service } from 'egg';
 import Counter from '@db/Counter';
+import { STATUS } from '@consts/statusCode';
 
 /**
  * Test Service
@@ -17,7 +18,7 @@ export default class GMUsers extends Service {
    * 根据类型等搜索玩家
    */
   public async getuserlist(field, value) {
-    // const {ctx} = this;
+    const {ctx} = this;
 
     let arr = new Array(), flag = 0;
     value = value.split(',');
@@ -39,10 +40,7 @@ export default class GMUsers extends Service {
     }
     
     if(flag) {
-        return {
-            "status": "error",
-            "data": "参数错误"
-        }
+        return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
     }
 
     let users = await UserModel.findUserByField(field, value);
@@ -54,15 +52,10 @@ export default class GMUsers extends Service {
             list.push({...user, hasRole: role?true: false, role});
         }
 
-      return {
-        "status": "ok",
-        "data": list
-      }
+        return ctx.service.utils.resResult(STATUS.SUCCESS, {list})
     } else {
-      return {
-        "status": "error",
-        "data": "未找到玩家"
-      }
+        console.error('userlist not found');
+        return ctx.service.utils.resResult(STATUS.INTERNAL_ERR);
     }
   }
 
@@ -75,12 +68,11 @@ export default class GMUsers extends Service {
     const seqId = await Counter.getNewCounter('role') || -1;
     const role = await RoleModel.createRole(uid, serverId, { roleId, code, roleName, seqId });
     if (role) {
-      return { status: "ok", data: { roleId: role.roleId } };
+        return ctx.service.utils.resResult(STATUS.SUCCESS);
+    } else {
+        console.error('create role error');
+        return ctx.service.utils.resResult(STATUS.INTERNAL_ERR);
     }
-    return {
-        "status": "error",
-        "data": "创建失败"
-    };
   }
 
 
@@ -88,7 +80,7 @@ export default class GMUsers extends Service {
    * 根据类型等搜索玩家
    */
   public async getrolelist(field, value) {
-    // const {ctx} = this;
+    const {ctx} = this;
 
     let arr = new Array(), flag = 0;
     value = value.split(',');
@@ -114,10 +106,7 @@ export default class GMUsers extends Service {
     }
     
     if(flag) {
-        return {
-            "status": "error",
-            "data": "参数错误"
-        }
+        return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
     }
 
     let roles = await RoleModel.findRoleByField(field, value);
@@ -135,21 +124,19 @@ export default class GMUsers extends Service {
                 key: roleId, roleId, roleName, serverId, lv, vLv, uid, tel, heroCount, equipCount, itemCount
             });
         }
-        return {
-            "status": "ok",
-            "data": result
-        }
+        return ctx.service.utils.resResult(STATUS.SUCCESS, { list: result });
     } else {
-      return {
-        "status": "error",
-        "data": "未找到玩家"
-      }
+        console.error('role list not found');
+        return ctx.service.utils.resResult(STATUS.INTERNAL_ERR);
     }
   }
 
-  public async createHero(uids: Array<string>, hid: number, hlv: number) {
+  public async createHero(uids: Array<string>, _hid: string, _hlv: string) {
     const {ctx} = this;
-    console.log('gm createHero', uids, hid, hlv);
+    console.log('gm createHero', uids, _hid, _hlv);
+    let hid = parseInt(_hid);
+    let hlv = parseInt(_hlv);
+    if(isNaN(hid) || isNaN(hlv)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
 
     let flag = 0, msg = '创建失败';
     for(let roleId of uids) {
@@ -184,21 +171,20 @@ export default class GMUsers extends Service {
     }
 
     if (flag) {
-        return {
-            "status": "error",
-            "data": msg
-        }
+        return ctx.service.utils.resResult(STATUS.GM_CREATE_ERROR, null, msg);
     } else {
-        return {
-            "status": "ok",
-            "data": uids
-        };
+        return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
     }
   }
 
-  public async createEquip(uids: Array<string>, eid: number, elv: number, ecount: number, ehid: number) {
+  public async createEquip(uids: Array<string>, _eid: string, _elv: string, _ecount: string, _ehid: string) {
     const {ctx} = this;
-    console.log('gm createEquip');
+    console.log('gm createEquip', uids, _eid, _elv, _ecount, _ehid);
+    let eid = parseInt(_eid);
+    let elv = parseInt(_elv);
+    let ecount = parseInt(_ecount);
+    let ehid = parseInt(_ehid);
+    if(isNaN(eid) || isNaN(elv) || isNaN(ecount) || isNaN(ehid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
 
     let flag = 0, msg = '创建失败';
     for(let roleId of uids) {
@@ -232,19 +218,19 @@ export default class GMUsers extends Service {
     }
 
     if (flag) {
-        return {
-            "status": "error",
-            "data": msg
-        }
+        return ctx.service.utils.resResult(STATUS.GM_CREATE_ERROR, null, msg);
     } else {
-        return {
-            "status": "ok",
-            "data": uids
-        };
+        return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
     }
   }
 
-  public async createItem(uids: Array<string>, itemid: number, itemcount: number) {
+  public async createItem(uids: Array<string>, _itemid: string, _itemcount: string) {
+    const {ctx} = this;
+    console.log('gm createItem', uids, _itemid, _itemcount);
+    let itemid = parseInt(_itemid);
+    let itemcount = parseInt(_itemcount);
+    if(isNaN(itemid) || isNaN(itemcount)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
+
     console.log('gm createEquip');
 
     let flag = 0;
@@ -273,15 +259,9 @@ export default class GMUsers extends Service {
     }
 
     if (flag) {
-        return {
-            "status": "error",
-            "data": "创建失败"
-        }
+        return ctx.service.utils.resResult(STATUS.GM_CREATE_ERROR);
     } else {
-        return {
-            "status": "ok",
-            "data": uids
-        };
+        return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
     }
   }
 }