is_marge

app/controller/order.js

@@ -91,10 +91,8 @@ class OrderController extends Controller {
       });
       ctx.body = {
         code: 0,
-        data: {
-          orderSn: orderId,
-        },
-        msg: '',
+        orderSn: orderId,
+        msg: '任务创建成功',
       };
     } catch (err) {
       ctx.logger.error('fetchOrderId', err);

app/controller/task.js

@@ -121,6 +121,7 @@ class TaskController extends Controller {
       ctx.body = {
         code: 0,
         data: { ...result, orderSn },
+        msg: '验证码获取成功',
       };
     } catch (err) {
       ctx.logger.error('submit', err);
@@ -200,6 +201,11 @@ class TaskController extends Controller {
           status: 'failure',
           note: { code: -1, msg: '系统错误', data: { data: null, loginParam: null, cityId: order.cityId, orderSn: order.orderId } },
         };
+        await service.cache.set({
+          key: orderId,
+          value: taskNote,
+        });
+        await service.partner.notice(order);
       }
       break;
     default:

app/service/partner.js

@@ -22,6 +22,8 @@ class PartnerService extends Service {
       if (ret.status === 200) {
         await order.update({ notice: '1' });
       }
+    } else {
+      ctx.logger.info('【Partner】 notice no notifyUrl', 'orderId:', orderId);
     }
     return;
   }

app/service/washData.js

@@ -11,8 +11,10 @@ class WashDataService extends Service {
     this.clearLoan = ['name', 'ID', 'warning_rate', 'fund_date', 'bank', 'phone', 'address', 'past_due', 'past_principle', 'past_interest', 'past_period', 'history_past_period', 'history_past_amount', 'assure_style', 'house_type', 'debit_account', 'left_period'];
   }
   async wash(data) {
-    const { app, washUrl, ctx } = this;
+    const { app, washUrl, ctx, service } = this;
     const rawdata = this._switchData(data);
+    const is_merge_detail = (await service.scripts.fetchOneScripts(rawdata.cityId)).is_merge_detail;
+    rawdata.is_merging = String(is_merge_detail);
     const washData = await app.curl(washUrl,
       {
         charset: 'utf-8',
@@ -43,8 +45,7 @@ class WashDataService extends Service {
     bar.taskId = tmp.taskId;
     bar.cityId = tmp.cityId;
     bar.data = JSON.parse(tmp.data);
-    bar.orderID = 'ttt';
-    bar.appKey = '';
+    bar.jsName = tmp.jsName;
     return bar;
   }
 

config/config.local.js

@@ -53,8 +53,8 @@ module.exports = () => {
   };
 
   config.washAPI = {
-    host: 'http://tt.51gjj.com:11101',
-    washUrl: '/gjj/analyzeGjj',
+    host: 'http://tt.51gjj.com:11007',
+    washUrl: '/v2/gjj/analyzeGjj',
   };
 
   config.signatureAPI = {

config/config.prod.js

@@ -51,8 +51,8 @@ module.exports = () => {
   config.cityListAPI = 'http://ts2.51gjj.com:4831/gjjServices/queryGjjCitySettings';
 
   config.washAPI = {
-    host: process.env.WASHAPI_HOST || 'http://tt.51gjj.com:11101',
-    washUrl: '/gjj/analyzeGjj',
+    host: process.env.WASHAPI_HOST || 'http://tt.51gjj.com:11007',
+    washUrl: '/v2/gjj/analyzeGjj',
   };
 
   config.signatureAPI = {