Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into m--tmp

app/api/controller/notify/MeiTuanNotifyController.php

@@ -85,6 +85,9 @@ class MeiTuanNotifyController extends BaseApiController
     {
         $order = $this->request->param();
         Log::write('开始预约:'.json_encode($this->request->param(),JSON_UNESCAPED_UNICODE));
+        //手动处理未配置的工单
+//        $request_msg = ThirdOrders::where('id',51)->findOrEmpty()['request_msg'];
+//        $order = json_decode($request_msg,true);
         ThirdOrderLogic::orderhandle($order);
         return $this->success('开始预约');
     }

app/common/logic/ThirdOrderLogic.php

@@ -76,7 +76,8 @@ class ThirdOrderLogic extends BaseLogic
         if($user->isEmpty()){
             $user = LoginLogic::register([
                 'password'=>'123456',
-                'account'=>$userName,
+                'nickname'=>$userName,
+                'account'=>$mobile,
                 'mobile'=>$mobile,
                 'channel'=>1,
                 'user_type'=>0
@@ -260,7 +261,8 @@ class ThirdOrderLogic extends BaseLogic
         if($user->isEmpty()){
             $user = LoginLogic::register([
                 'password'=>'123456',
-                'account'=>$userName,
+                'nickname'=>$userName,
+                'account'=>$mobile,
                 'mobile'=>$mobile,
                 'channel'=>1,
                 'user_type'=>0,