Merge branch 'feature_cwf_wechat_bind' into colonel

application/services/user/UserService.php

@@ -28,6 +28,8 @@ class UserService
     {
         $code = !empty($params['code']) ? $params['code'] : '';//小程序授权code
         $openid = !empty($params['openid']) ? $params['openid'] : '';//小程序授权code
+        $inviteUserId = !empty($params['invite_user_id']) ? intval($params['invite_user_id']) : 0;//邀请用户id
+        $activityType = !empty($params['activity_type']) ? intval($params['activity_type']) : 0;//活动类型
         if (empty($code) && empty($openid)) {
             FileLog::error("wechatLogin:获取参数为空", json_encode($params, JSON_UNESCAPED_UNICODE), '', 'jianghaiming@yidian-inc.com');
             throw new UserException(['cus' => 0]);
@@ -90,6 +92,8 @@ class UserService
                 'openid' => !empty($response['openid']) ? $response['openid'] : '',
                 'union_id' => !empty($response['unionid']) ? $response['unionid'] : '',
                 'session_key' => !empty($response['session_key']) ? $response['session_key'] : '', //默认7200有效期
+                'invite_user_id' => $inviteUserId,
+                'activity_type' => $activityType,
                 'create_time' => date("Y-m-d H:i:s")
             ];