修改接口返回参数

chenshijie · Mar 27, 2012 · 35ceea3 · 35ceea3
1 parent 26ccac2
commit 35ceea3
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 18 deletions.
diff --git a/gateway-server.js b/gateway-server.js
@@ -302,30 +302,45 @@ app.get('/Auth/:idcode/Order', function(req, res) {
   var ua = req.query.ua;
   var ak = req.query.ak;
   var ip = req.query.ip;
+  var responseData = {};
   if (!_.include(['list', 'order', 'cancel'], action)) {
-    res.end('action error!')
+    responseData['status_code'] = 404;
+    responseData['status_txt'] = 'action error';
+    res.end(JSON.stringify(responseData));
   } else if (isEmpty(ac) || isEmpty(mc) || isEmpty(mt) || isEmpty(ua) || isEmpty(ak) || isEmpty(ip)) {
-    res.end('参数错误');
+    responseData['status_code'] = 404;
+    responseData['status_txt'] = 'lost one or more essential parameters';
+    res.end(JSON.stringify(responseData));
   } else {
     guidService.getMSISDNByIDCode(idcode, function(result) {
       if (!result.error && !isEmpty(result.msisdn)) {
         if (action == 'list') {
-          auth.getOrders(result.msisdn, ac, mc, mt, ua, ak, ip, function(authResult){
-            res.end(JSON.stringify(authResult));
+          auth.listOrders(result.msisdn, ac, mc, mt, ua, ak, ip, function(authResult){
+            responseData['status_code'] = 200;
+            responseData['status_txt'] = 'OK';
+            responseData['result'] = authResult;
+            res.end(JSON.stringify(responseData));
           });
         }
         if (action == 'order') {
+          responseData['status_code'] = 200;
+          res.end(JSON.stringify(responseData));
           auth.doOrder(result.msisdn, ac, mc, mt, ua, ak, ip, function(authResult){
-            res.end(JSON.stringify(authResult));
+            console.log(authResult);
           });
         }
         if (action == 'cancel') {
+          responseData['status_code'] = 200;
+          responseData['status_txt'] = 'OK';
+          res.end(JSON.stringify(responseData));
           auth.doCancelOrder(result.msisdn, ac, mc, mt, ua, ak, ip, function(authResult){
-            res.end(JSON.stringify(authResult));
+            console.log(uthResult);
           });
         }
       } else {
-        res.end('用户未绑定手机号');
+        responseData['status_code'] = 404;
+        responseData['status_txt'] = 'client not bind msisdn';
+        res.end(JSON.stringify(responseData));
       }
     });
   }

diff --git a/lib/auth.js b/lib/auth.js
@@ -28,9 +28,11 @@ Authority.prototype.doAuth = function(msisdn, ac, mc, mt, ua, ak, ip, functionID
       var temp = body.substr(0, 3);
       var result = {};
       if (temp == '000') {
-        result['result'] = true;
+        result['result'] = 200;
+      } else if(temp == '001') {
+        result['result'] = 211; //未订购，提示订购
       } else {
-        result['result'] = false;
+        result['result'] = 219; //其他错误
       }
       result['message'] = body;
       callback(result);
@@ -58,9 +60,9 @@ Authority.prototype.doOrder = function(msisdn, ac, mc, mt, ua, ak, ip, callback)
       var temp = body.substr(0, 3);
       var result = {};
       if (temp == '000') {
-        result['result'] = true;
+        result['result'] = 200; //订购成功
       } else {
-        result['result'] = false;
+        result['result'] = 221;
       }
       result['message'] = body;
       callback(result);
@@ -89,9 +91,9 @@ Authority.prototype.doCancelOrder = function(msisdn, ac, mc, mt, ua, ak, ip, cal
       var temp = body.substr(0, 3);
       var result = {};
       if (temp == '000') {
-        result['result'] = true;
+        result['result'] = 200; //退订成功
       } else {
-        result['result'] = false;
+        result['result'] = 219; //退订失败
       }
       result['message'] = body;
       callback(result);
@@ -101,7 +103,7 @@ Authority.prototype.doCancelOrder = function(msisdn, ac, mc, mt, ua, ak, ip, cal
 };
 
 ///Auth2/action?c=04&v=200&sc=0001&ac=00000000&mc=00000&mt=00000000000000000000&MSISDN=15885438327&ua=Android1.6&ip=10.235.181.167&uid=2008&AK=038ME08
-Authority.prototype.getOrders = function(msisdn, ac, mc, mt, ua, ak, ip, callback) {
+Authority.prototype.listOrders = function(msisdn, ac, mc, mt, ua, ak, ip, callback) {
   ///Auth2/action?c=04&v=200&sc=0001&ac=00000000&mc=00000&mt=00000000000000000000&MSISDN=15885438327&ua=Android1.6&ip=10.235.181.167&uid=2008&AK=038ME08
   var path = '/Auth2/action?c=04&v=200&sc=0001&ac=' + ac + '&mc=' + mc + '&mt=' + mt + '&MSISDN=' + msisdn + '&ua=' + ua + '&ip=' + ip + '&uid=2012&AK=' + ak;
   var options = {
@@ -119,12 +121,29 @@ Authority.prototype.getOrders = function(msisdn, ac, mc, mt, ua, ak, ip, callbac
     response.on('end', function() {
       var temp = body.substr(0, 3);
       var result = {};
-      if (_.include(['000', '010', '009'], temp)) {
-        result['result'] = true;
+      if (temp == '000') {
+        result['code'] = 200;
+      } else if(temp = '009') {
+        if(body == '009订购请求已受理，处理中。') {
+          result['code'] = 201;
+          result['msg'] = '订购请求已受理，处理中。';
+        } else if(body == '009退订请求已受理，处理中。') {
+          result['code'] = 202; 
+          result['msg'] = '退订请求已受理，处理中。';
+        } else if(body == '009没有订购任何服务.') {
+          result['code'] = 203;
+          result['msg'] = '没有订购任何服务。';
+        } else {
+          result['code'] = 204;
+          result['msg'] = body;
+        }
+      } else if(temp = '010') {
+        result['code'] = 210; //渠道免费,不显示订购按钮
+        result['msg'] = '手机证券竭诚为投资者服务，免费提供海量投资指导信息，【市场热点解读】把握形势、【潜力金股排行】轻松选股、【资金流向数据】紧跟主力，让您与高手同行，与机构同步！';
       } else {
-        result['result'] = false;
+        result['code'] = 209;
+        result['msg'] = body;
       }
-      result['message'] = body;
       callback(result);
     });
   });