Merge branch 'feature-deliver210913' into test

application/services/user/UserService.php

@@ -213,8 +213,14 @@ class UserService
         if (!empty($check) && $check['status'] == 'failed') {
             throw new BaseException(['code' => $check['code'], 'msg' => $check['reason']]);
         }
+        $jwUser = (new JwUser ())->getUserInfo(['mobile' => $mobile]);
+        $userId = '';
+        if (!empty($jwUser['data'])) {
+            $data = $jwUser['data'];
+            $userId = !empty($data['userId']) ? $data['userId'] : '';
+        }
         $userInfo = UserWechatBind::getRecordMaster(['openid' => self::$openid]);
-        CommonService::activateDeliverer(['user_id' => $userInfo['user_id'],'phone' => $userInfo['phone']]);
+        CommonService::activateDeliverer(['user_id' => $userId,'phone' => $mobile]);
         $userInfo = array_merge($userInfo,self::saveWechatPhone($mobile,$userInfo)) ;
         return $userInfo;
     }