Merge branch 'dev-xpy' into dev

# Conflicts:
#	app/controller/api/Auth.php

app/controller/api/Auth.php

@@ -734,9 +734,9 @@ class Auth extends BaseController
         }
         //养老金展示
         // $data['annuity'] = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
-        $a = Db::name('user_bill')->where('uid', $user['uid'])->where('commission_type', 5)->where('pm', 1)->whereIn('status', [0, 1])->sum('number');
-        $b = Db::name('user_bill')->where('uid', $user['uid'])->where('commission_type', 5)->where('pm', 0)->whereIn('status', [0, 1])->sum('number');
-        $data['annuity'] = $a - $b;
+        $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',0) -> sum('number');
+        $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
+        $data['annuity'] = $a +$b;
         //上级身份是否大仓会员
         $is_da_cang_vip=Db::name('da_cang_user')->where('status',1)->where('uid',$user["uid"])->find();
         //渠道商
@@ -1401,7 +1401,7 @@ class Auth extends BaseController
 
     public function verify(UserAuthValidate $validate)
     {
-        $data = $this->request->params(['phone', 'code', 'key',"type", 'areaCode']);
+        $data = $this->request->params(['phone', 'code', 'key',"type"]);
         $validate->sceneVerify()->check($data);
         log::info("发送短信方法");
         if ($data['type']=="login"){
@@ -1442,7 +1442,7 @@ class Auth extends BaseController
         $sms_key = 'api.auth.sms.' . $data['phone'];
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
         $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30 ;
-        $res = app()->make(AliYunSmsService::class)->send(($data['areaCode'] ?? '') . $data['phone'],  $sms_code);
+        $res = app()->make(AliYunSmsService::class)->send($data['phone'],  $sms_code);
         if($res['Code']!='OK'){
             Db::name('log')->insert(['data'=>'幸福保短信发送失败：'.json_encode($res,256)]);
             return app('json')->fail('操作过于频繁，请稍后重试~');
@@ -1759,31 +1759,33 @@ class Auth extends BaseController
     }
 
 
-    /**
-     * 微信授权登录 一键登录
-     * @return mixed
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     */
-    public function wechatCheck()
-    {
-        $data = $this->request->params(['openid']);
+    /*微信授权登录*/
+    public function wechatCheck(){
+        $data =  $this->request->params(['openid']);
+        // , 'nickname', 'avatar'
         $data['nickname'] = $this->request->param('nickname', null);
         $data['avatar'] = $this->request->param('avatar', null);
 
-        if (!$data['openid'] || $data['openid'] == '' || $data['openid'] == 'undefined') {
+        if(!$data['openid'] || $data['openid'] == '' || $data['openid'] =='undefined'){
             return app('json')->fail("openid参数缺失");
         }
 
-        /** @var UserRepository $repository */
         $repository = app()->make(UserRepository::class);
-        $result = $repository->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
-
-        if (isset($result['code']) && $result['code'] == 200) {
+        if($this->source=='yhc'){
+            $result =  $repository ->wechatCheckYhc($data['openid']);
+        }else{
+            $result =  $repository ->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
+        }
+        if(isset($result['code']) && $result['code'] == 200){
             $user = $repository->accountByUser($result['user']['account']);
             $tokenInfo = $repository->createToken($user);
             $repository->loginAfter($user);
+            if($this->source=='yhc'){
+//                $user=$user->toArray();
+                $user->avatar=Db::name('enterprise_user')->where('mer_id',$this->merId)->where('uid',$user['uid'])->value('avatar');
+            }
+
+
             return app('json')->success($repository->returnToken($user, $tokenInfo));
         }
         return app("json")->fail($result['msg']);
@@ -2090,47 +2092,50 @@ class Auth extends BaseController
             }
             $user_res=Db::name('user')->where('account',$phone)->find();
 
+            $isnew = false;
+
             if(!$user_res){
                 $spread_uid=Db::name('product_share')->where('id',$share_id['share_id'])->value('uid');
                 if (!intval($spread_uid)) {
                     $spread_uid = 0;
                 }
                 $repository->registr($phone, 123456,'APP','','','',$spread_uid);
+
+                $isnew = true;
             }
             $user = $repository->accountByUser($phone);
-            // if($this->source=='yhc' && $this->merId){
-            //     $where=['mer_id'=>$this->merId,'uid'=>$user['uid']];
-            //     $count=Db::name('enterprise_user')->where($where)->count();
-            //     if($count<1){
-            //         $insert=['mer_id'=>$this->merId,'uid'=>$user['uid']];
-            //         $data = $this->request->params(['spread', 'share_id']);
-            //
-            //         if(isset($data['spread']) && $data['spread']){
-            //             $insert['puid']= $data['spread'];
-            //             $insert['node_uid']= $data['spread'];
-            //         }else if(isset($data['share_id']) && $data['share_id']){
-            //             $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-            //             $insert['puid']= $spread_uid;
-            //             $insert['node_uid']= $spread_uid;
-            //         }
-            //         if(!isset($insert['node_uid']) || !$insert['node_uid']){
-            //             return app('json')->fail('必须要有邀请人才能注册',['is'=>1]);
-            //         }
-            //
-            //         if(isset($data['spread']) && isset($zhuce)){
-            //             $insert['puid']= $data['spread'];
-            //             $insert['node_uid']= $data['spread'];
-            //         }
-            //         Db::name('enterprise_user')->insert($insert);
-            //     }
-            // }
-            if (!empty($user) && $user instanceof User) {
-                $user = $repository->mainUser($user);
-                $tokenInfo = $repository->createToken($user);
-                return app('json')->success($repository->returnToken($user, $tokenInfo));
-            } else {
-                return app('json')->fail('未查询到用户信息');
+            if($this->source=='yhc' && $this->merId){
+                $where=['mer_id'=>$this->merId,'uid'=>$user['uid']];
+                $count=Db::name('enterprise_user')->where($where)->count();
+                if($count<1){
+                    $insert=['mer_id'=>$this->merId,'uid'=>$user['uid']];
+                    $data = $this->request->params(['spread', 'share_id']);
+
+                    if(isset($data['spread']) && $data['spread']){
+                        $insert['puid']= $data['spread'];
+                        $insert['node_uid']= $data['spread'];
+                    }else if(isset($data['share_id']) && $data['share_id']){
+                        $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
+                        $insert['puid']= $spread_uid;
+                        $insert['node_uid']= $spread_uid;
+                    }
+                    if(!isset($insert['node_uid']) || !$insert['node_uid']){
+                        return app('json')->fail('必须要有邀请人才能注册',['is'=>1]);
+                    }
+
+                    if(isset($data['spread']) && isset($zhuce)){
+                        $insert['puid']= $data['spread'];
+                        $insert['node_uid']= $data['spread'];
+                    }
+                    Db::name('enterprise_user')->insert($insert);
+                }
             }
+            $user = $repository->mainUser($user);
+
+            $tokenInfo = $repository->createToken($user);
+
+            return app('json')->success(array_merge($repository->returnToken($user, $tokenInfo), ['is_new' => $isnew ? 1 : 0]));
+
         }catch (Exception $exception){
             Db::name('log')->insert(['data'=>'获取手机号失败--'.$exception->getFile().'：'.$exception->getLine().'【'.$exception->getMessage().'】']);
         }