兼容老版生成订单号接口

app/controller/order.js

@@ -28,6 +28,18 @@ class OrderController extends Controller {
         },
       },
     };
+
+    this.fetchRule = {
+      sign: 'string',
+      params: {
+        type: 'object',
+        rule: {
+          appKey: 'string',
+          timestamp: 'string',
+          token: 'string',
+        },
+      },
+    };
   }
 
   async create() {
@@ -88,14 +100,15 @@ class OrderController extends Controller {
       }
       ctx.body = {
         code: -1,
-        message: '无此订单号'
+        msg: '无此订单号'
       };
     } catch (err) {
+      ctx.logger.error('partnerShow', JSON.stringify(err));
       ctx.status = 200;
       if (err.code == 'invalid_param') {
-        return ctx.body = { code: -1, message: err.message || '' };
+        return ctx.body = { code: -1, msg: err.message || '' };
       }
-      return ctx.body = { code: err.code || -1, message: err.message || '' };
+      return ctx.body = { code: err.code || -1, msg: err.message || '' };
     }
   }
 
@@ -114,21 +127,36 @@ class OrderController extends Controller {
     ctx.fail('无此订单号');
   }
 
-  // async fetchOrderId() {
-  //   const { ctx, service } = this;
-  //   const signParams = ctx.helper.buildRequestBody({ token });
-  //   const { appKey } = signParams.params;
-  //   const orderId = await service.signature.createOrderId(signParams);
-  //   await service.order.create({
-  //     orderId,
-  //     taskId: '',
-  //     userId: '',
-  //     cityId: '',
-  //     appKey: appKey,
-  //     status: 'init',
-  //   });
-  //   ctx.success({ orderId });
-  // }
+  async fetchOrderId() {
+    const { ctx, service } = this;
+    try {
+      ctx.validate(this.fetchRule);
+      const { appKey } = ctx.request.body.params;
+      const orderId = await service.signature.createOrderId(ctx.request.body);
+      await service.order.create({
+        orderId,
+        taskId: '',
+        cityId: '',
+        notifyUrl: ctx.app.notifyMap.get(appKey) && ctx.app.notifyMap.get(appKey).notifyUrl || '',
+        appKey: appKey,
+        status: 'init',
+      });
+      ctx.body = {
+        code: 0,
+        data: {
+          orderSn: orderId
+        },
+        msg: ''
+      }
+    } catch (err) {
+      ctx.logger.error('fetchOrderId', JSON.stringify(err));
+      ctx.status = 200;
+      if (err.code == 'invalid_param') {
+        return ctx.body = { code: -1, msg: err.message || '' };
+      }
+      return ctx.body = { code: err.code || -1, msg: err.message || '' };
+    }
+  }
 }
 
 module.exports = OrderController;

app/controller/token.js

@@ -27,20 +27,19 @@ class TokenController extends Controller {
     const { ctx, service } = this;
     try {
       ctx.validate(this.createRule);
-    } catch (err) {
-      ctx.logger.info(JSON.stringify(err));
-      return ctx.body = { code: -1, message: err.message };
-    }
-    try {
       const token = await service.signature.createToken(ctx.request.body);
       return ctx.body = {
         code: 0,
         data: { token },
-        message: ''
+        msg: ''
       }
     } catch (err) {
+      ctx.logger.error('partnerCreate', JSON.stringify(err));
       ctx.status = 200;
-      return ctx.body = { code: err.code || -1, message: err.message || '' };
+      if (err.code == 'invalid_param') {
+        return ctx.body = { code: -1, msg: err.message || '' };
+      }
+      return ctx.body = { code: err.code || -1, msg: err.message || '' };
     }
   }
 }

app/middleware/errorHandler.js

@@ -3,7 +3,7 @@
 module.exports = (options, app) => {
   return async function errorHandler(ctx, next) {
     try {
-      if(ctx.request.method == 'post'){
+      if(ctx.request.method == 'POST'){
         app.logger.info(JSON.stringify(ctx.request.body));
       }
       await next();

app/router.js

@@ -35,7 +35,7 @@ module.exports = app => {
 
   gjjRouter.post('/getToken', controller.token.partnerCreate);// 合作方创建token
 
-  // gjjRouter.post('/getorderSn');
+  gjjRouter.post('/getorderSn',controller.order.fetchOrderId);//合作方获取订单号
 
   gjjRouter.post('/getData', controller.order.partnerShow);// 合作方获取订单数据