Commit 0185df87 authored by 何娜's avatar 何娜

调试提示

parent 334a23b9
...@@ -77,11 +77,6 @@ class TaskController extends Controller { ...@@ -77,11 +77,6 @@ class TaskController extends Controller {
password: md5(args.password) || '', password: md5(args.password) || '',
}, },
}, { orderId, taskId: task_id }); }, { orderId, taskId: task_id });
// service.cache.set({
// key: String(task_id) + data.data.orderId,
// value: { status: 'login', note: { message: 'login' } },
// });
// ctx.success({ errcode: 0, taskId: task_id });
ctx.success({ errcode: 0, data: { task_id } }); ctx.success({ errcode: 0, data: { task_id } });
} }
...@@ -226,10 +221,6 @@ class TaskController extends Controller { ...@@ -226,10 +221,6 @@ class TaskController extends Controller {
}; };
ctx.logger.info('【handleCallback】 fetchTask') ctx.logger.info('【handleCallback】 fetchTask')
const result = await service.task.fetchTask({ taskId }); const result = await service.task.fetchTask({ taskId });
// let taskNote = {
// status: 'init',
// note: { message: 'init' },
// };
switch (result.code) { switch (result.code) {
case -1: case -1:
service.order.update({ service.order.update({
...@@ -237,27 +228,13 @@ class TaskController extends Controller { ...@@ -237,27 +228,13 @@ class TaskController extends Controller {
note: result, note: result,
}, { orderId, taskId }); }, { orderId, taskId });
ctx.success({ errcode: 1, data: { state: -1, result: '服务器出错,请稍后重试' } }); ctx.success({ errcode: 1, data: { state: -1, result: '服务器出错,请稍后重试' } });
// taskNote = {
// status: 'failure',
// note: { message: result.msg },
// };
break; break;
case 1: case 1:
// if (result.data.data) {
// result.data = {
// data: JSON.parse(JSON.parse(result.data.data).post_data.strForNextStep),
// loginParam: result.data.loginParam,
// };
// }
service.order.update({ service.order.update({
status: 'next', status: 'next',
note: result, note: result,
}, { orderId, taskId }); }, { orderId, taskId });
ctx.success({ errcode: 0, data: { state: 1, html: service.index.getSMSHTML() } }); ctx.success({ errcode: 0, data: { state: 1, html: service.index.getSMSHTML() } });
// taskNote = {
// status: 'next',
// note: { message: 'waiting', nextStep: result.data },
// };
break; break;
case 110: case 110:
service.order.update({ service.order.update({
...@@ -265,16 +242,8 @@ class TaskController extends Controller { ...@@ -265,16 +242,8 @@ class TaskController extends Controller {
note: result, note: result,
}, { orderId, taskId }); }, { orderId, taskId });
ctx.success({ errcode: 0, data: { state: 5, result: '更改为Query' } }); ctx.success({ errcode: 0, data: { state: 5, result: '更改为Query' } });
// taskNote = {
// status: 'query',
// note: { message: 'submit success' },
// };
break; break;
case 0: case 0:
// taskNote = {
// status: 'wash',
// note: { message: 'wash' },
// };
try { try {
service.order.update({ service.order.update({
status: 'wash', status: 'wash',
...@@ -282,10 +251,6 @@ class TaskController extends Controller { ...@@ -282,10 +251,6 @@ class TaskController extends Controller {
}, { orderId, taskId }); }, { orderId, taskId });
await service.washData.wash(result, orderId); await service.washData.wash(result, orderId);
await service.washData.newWash(result, orderId); await service.washData.newWash(result, orderId);
// await service.cache.set({
// key: String(taskId),
// value: taskNote,
// });
ctx.success({ errcode: 2, data: { state: 0, result: '发送数据处理' } }); ctx.success({ errcode: 2, data: { state: 0, result: '发送数据处理' } });
} catch (err) { } catch (err) {
ctx.logger.error('handleCallback 0', JSON.stringify(err), JSON.stringify(result)); ctx.logger.error('handleCallback 0', JSON.stringify(err), JSON.stringify(result));
...@@ -294,10 +259,6 @@ class TaskController extends Controller { ...@@ -294,10 +259,6 @@ class TaskController extends Controller {
note: '运营商认证分析失败', note: '运营商认证分析失败',
}, { orderId, taskId }); }, { orderId, taskId });
ctx.success({ errcode: 1, data: { state: -1, result: '运营商认证分析失败' } }); ctx.success({ errcode: 1, data: { state: -1, result: '运营商认证分析失败' } });
// taskNote = {
// status: 'failure',
// note: { message: err.message },
// };
} }
break; break;
default: default:
......
...@@ -1012,7 +1012,8 @@ $(function() { ...@@ -1012,7 +1012,8 @@ $(function() {
constant.script_root + 'submit', constant.script_root + 'submit',
{ ...params, orderId: constant.orderNum }, { ...params, orderId: constant.orderNum },
function(response) { function(response) {
if (response.errcode == 0) { console.log('【submit】', JSON.stringify(response))
if (response.errcode === 0) {
const taskId = response.data.task_id; const taskId = response.data.task_id;
if (!!window.WebSocket && window.WebSocket.prototype.send) { if (!!window.WebSocket && window.WebSocket.prototype.send) {
const wsParams = { const wsParams = {
...@@ -1024,9 +1025,9 @@ $(function() { ...@@ -1024,9 +1025,9 @@ $(function() {
} else { } else {
const params = { taskId: response.data.task_id, orderId: constant.orderNum, phone: constant.phone, redirectUrl: constant.redirectUrl, appkey: constant.appkey }; const params = { taskId: response.data.task_id, orderId: constant.orderNum, phone: constant.phone, redirectUrl: constant.redirectUrl, appkey: constant.appkey };
listen_job_v2(params, function(state, result) { listen_job_v2(params, function(state, result) {
if (state == 2 || state == 3) { if (state === 2 || state === 3) {
fn(); fn();
} else if (state == 1) { } else if (state === 1) {
constant.hasclick = true; constant.hasclick = true;
if (step == 1) { if (step == 1) {
title = '成功登录,请获取二次验证码'; title = '成功登录,请获取二次验证码';
...@@ -1104,12 +1105,10 @@ $(function() { ...@@ -1104,12 +1105,10 @@ $(function() {
} }
}); });
} }
} else { } else {
setTimeout(function() { setTimeout(function() {
failed(); failed();
$.prompt(response.errmsg); $.prompt(response.data.result);
}, 250); }, 250);
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment