Merge branch 'master' of https://t-git.51gjj.com/fangbin/51business

app/service/credit/apply.js

@@ -24,7 +24,7 @@ class ApplyService extends Service {
         if (!ctx.userId) {
             ctx.failed('登录异常');
         }
-        let bePayOrder = await ctx.service.credit.order.getBePayOrder(1);
+        let bePayOrder = await ctx.service.credit.order.getBePayOrder('blacklist');
         if (bePayOrder.length !== 0) {
             ret.have_be_pay_order = true;
             ret.order_id = bePayOrder[0].id;
@@ -126,7 +126,7 @@ class ApplyService extends Service {
             name: inputParams.name,
             id_card: inputParams.id_card
         }
-        await app.redis.set(codeKey, codeData, 'EX', 60 * 5);//5分钟有效时间
+        await app.redis.set(codeKey, JSON.stringify(codeData), 'EX', 60 * 5);//5分钟有效时间
 
 
         let smsParams = {
@@ -161,6 +161,11 @@ class ApplyService extends Service {
         //验证码校验
         let codeKey = 'mine:credit:black:code' + inputParams.phone;
         let codeData = await app.redis.get(codeKey);
+        ctx.logger.info({ codeData: codeData });
+        if (codeData === null || !codeData) {
+            ctx.failed('请先获取验证码');
+        }
+        codeData = JSON.parse(codeData);
         if (codeData.code !== inputParams.code) {
             ctx.failed('验证码错误，请重试');
         }
@@ -184,7 +189,7 @@ class ApplyService extends Service {
         }
 
         //判断用户当前三要素是否是二次查询未支付订单
-        let bePayOrderInfo = await ctx.service.credit.order.getBePayOrderByThree(1, inputParams);
+        let bePayOrderInfo = await ctx.service.credit.order.getBePayOrderByThree('blacklist', inputParams);
         if (bePayOrderInfo.have) {
             ret.second = true;
             ret.order_id = bePayOrderInfo.order.id;

app/service/credit/blacklist.js

@@ -246,7 +246,7 @@ class BlacklistService extends Service {
         }
 
         //订单是否在有效期内
-        ret.report_valid = await ctx.service.credit.order.getReportValid(1, id);
+        ret.report_valid = await ctx.service.credit.order.getReportValid('blacklist', id);
 
         return ret;
     }

app/service/credit/callrisk.js

@@ -47,7 +47,7 @@ class CallriskService extends Service {
         const call_behavior = await this.getCallBehavior(report_id);
 
         //订单是否在有效期内
-        const report_valid = await ctx.service.credit.order.getReportValid(2, report_id);
+        const report_valid = await ctx.service.credit.order.getReportValid('callrisk', report_id);
         const report = {
             basics: { data: basics },
             call_overview: { data: call_overview },

app/service/credit/order.js

@@ -143,20 +143,20 @@ class OrderService extends Service {
 
     /**
      * 
-     * @param {*} type 报告类型(黑名单1通话2)
+     * @param {*} type 报告类型(黑名单blacklist通话callrisk)
      * @param {*} reportId 订单编号
      */
     async getReportValid(type, reportId) {
         const { ctx } = this;
         let valid = 0;
-        if (![1, 2].includes(type)) {
+        if (!TypeConfig.hasOwnProperty(type)) {
             return valid;
         }
-        let timeLine = (type === 1) ? 15 : 30;
+        let timeLine = (TypeConfig[type] === 1) ? 15 : 30;
         let orderFilter = {
             where: {
                 report_id: reportId,
-                type: type,
+                type: TypeConfig[type],
                 valid: 1
             }
         };
@@ -187,7 +187,7 @@ class OrderService extends Service {
         if (!order || !order.id) {
             ctx.failed('error order');
         }
-        const preferential = await this.getPreferential(order.type);
+        const preferential = await this.getPreferential(TypeConfigFlip[order.type]);
         let preferential_price = 0;
         let preferential_title = '';
         if (preferential && preferential.id) {
@@ -252,13 +252,13 @@ class OrderService extends Service {
             have: false,
             order: {}
         }
-        if (![1, 2].includes(type)) {
+        if (!TypeConfig.hasOwnProperty(type)) {
             return ret;
         }
         let orderFilter = {
             where: {
                 user_id: ctx.userId,
-                type: type,
+                type: TypeConfig[type],
                 state: '待支付',
                 valid: 1,
                 state_time: { $gte: moment().subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss') }
@@ -273,7 +273,7 @@ class OrderService extends Service {
                         name: threeParams.name,
                         phone: threeParams.phone,
                         id_card: threeParams.id_card,
-                        type: 1,
+                        type: TypeConfig[type],
                         valid: 1
                     }
                 }
@@ -367,13 +367,13 @@ class OrderService extends Service {
     async getBePayOrder(type) {
         const { ctx } = this;
         let ret = [];
-        if (![1, 2].includes(type)) {
+        if (!TypeConfig.hasOwnProperty(type)) {
             return ret;
         }
         let filter = {
             where: {
                 user_id: ctx.userId,
-                type: type,
+                type: TypeConfig[type],
                 state: '待支付',
                 valid: 1,
                 state_time: { $gte: moment().subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss') }
@@ -411,15 +411,14 @@ class OrderService extends Service {
         }
         let order = await ctx.prometheusModel.CreditOrder.create(data);
         //生成order_no
-        let orderNoType = params.type === 1 ? 'blacklist' : 'callrisk';
-        let orderNo = await ctx.service.credit.common.getOrdertNo(orderNoType, order.id);
+        let orderNo = await ctx.service.credit.common.getOrdertNo(TypeConfigFlip[order.type], order.id);
         await ctx.prometheusModel.CreditOrder.update({ order_no: orderNo }, { where: { id: order.id } });
         return order;
     }
 
     /**
      * 获取用户可以享受的优惠类型
-     * @param {*} type 用户当前操作的订单类型1黑名单2通话
+     * @param {*} type 用户当前操作的订单类型黑名单blacklist通话callrisk
      */
     async getPreferential(type) {
         const { ctx } = this;