is_marge

app/controller/order.js

@@ -75,6 +75,7 @@ class OrderController extends Controller {
     } else {
       if (!userId) {
         ctx.throw(422, { message: '请输入userId' });
+        return;
       }
       object.orderId = ctx.helper.getUuid();
       await service.order.create(object);

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;
   }