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

app/service/credit/apply.js

@@ -415,17 +415,31 @@ class ApplyService extends Service {
         const { name, phone, id_card } = input;
         const { user_id } = this;
         const type = TypeConfig['callrisk'];//个人通话类型
-        let first = false;//首次通过三要素验证后弹框提示:报告生成后，将无法查询其他人的报告
+
         let second = false;//再次查询的是待支付中的订单
         let order_id = null;
         let report_id = null;
 
-        //判断用户是否第一次三要素核验成功
-        const order_filter = { arrtibutes: ['id'], where: { user_id, type, valid: 1 } }
-        const order_list = await ctx.prometheusModel.CreditOrder.findAll(order_filter);
-        if (order_list === undefined || order_list.length === 0) {
-            first = true;
+        //当用户在首笔“黑名单检测报告”或“个人通话检测报告”支付成功后，当用户查询其他不同的2要素(姓名,身份证)信息时:仅供本人查询使用，无法查询其他人信息
+        let orderFilter = {
+            arrtibutes: ['id', 'name', 'id_card'],
+            where: {
+                user_id: ctx.userId,
+                state: '已支付',
+                type: 2,
+                valid: 1
+            }
         }
+        let orderInfo = await ctx.prometheusModel.CreditOrder.findOne(orderFilter);
+        if (orderInfo !== null && (inputParams.name !== orderInfo.name || inputParams.id_card !== orderInfo.id_card)) {
+            ctx.failed('仅供本人查询使用，无法查询其他人信息');
+        }
+
+        // const order_filter = { arrtibutes: ['id'], where: { user_id, type, valid: 1 } }
+        // const order_list = await ctx.prometheusModel.CreditOrder.findAll(order_filter);
+        // if (order_list === undefined || order_list.length === 0) {
+        //     first = true;
+        // }
 
         //判断用户当前三要素是否是二次查询未支付订单
         const be_pay_order = await ctx.service.credit.order.getBePayOrderByThree('callrisk', { name, phone, id_card });
@@ -435,7 +449,7 @@ class ApplyService extends Service {
             report_id = be_pay_order.report_id;
         }
 
-        return { order_id, report_id, first, second };
+        return { order_id, report_id, second };
     }
 
 

app/service/credit/callrisk.js

@@ -898,7 +898,7 @@ class CallriskService extends Service {
         }
         await ctx.prometheusModel.CreditCallriskSilenceCycle.bulkCreate(silence_cycle_report);
 
-        await ctx.prometheusModel.CreditOrder.update({ report_id, state: '待支付', order_time: moment().format('YYYY-MM-DD HH:mm:ss'), state_time: moment().format('YYYY-MM-DD HH:mm:ss') }, { where: {} });
+        await ctx.prometheusModel.CreditOrder.update({ report_id, valid: 1, state: '待支付', order_time: moment().format('YYYY-MM-DD HH:mm:ss'), state_time: moment().format('YYYY-MM-DD HH:mm:ss') }, { where: {} });
         // const report_no = await ctx.service.credit.common.getReportNo('callrisk', report_id);
         // await ctx.prometheusModel.CreditCallriskReport.update({ report_no }, { where: { id: report_id } });