Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/user/UserRepository.php

@@ -148,9 +148,9 @@ class UserRepository extends BaseRepository
         }
 
 
-//        $area_manage=Db::name('area_manage')->where('uid',$id)->find();
+        //        $area_manage=Db::name('area_manage')->where('uid',$id)->find();
         $area_manage=null;
-//        $area_manage_type=Db::name('area_manage')->where('uid',$id)->value('type');
+        //        $area_manage_type=Db::name('area_manage')->where('uid',$id)->value('type');
         //类型 district-区/县代 city-市代',
         $user['area_manage_type'] ='0';
 
@@ -278,25 +278,25 @@ class UserRepository extends BaseRepository
 
 
         ];
-//        1 镇代 2 县代 3 市代 4 商户 5 推广员
-//        $title="用户";
-//        if ($user['identity']==1){
-//            $title="镇代";
-//        }
-//        if ($user['identity']==2){
-//            $title="县代";
-//        }
-//        if ($user['identity']==3){
-//            $title="市代";
-//        }
-//        if ($user['identity']==4){
-//            $title="商户";
-//        }
-//        if ($user['identity']==5){
-//            $title="推广员";
-//        }
-//
-//        $where[] = Elm::text('identity', $title );
+        //        1 镇代 2 县代 3 市代 4 商户 5 推广员
+        //        $title="用户";
+        //        if ($user['identity']==1){
+        //            $title="镇代";
+        //        }
+        //        if ($user['identity']==2){
+        //            $title="县代";
+        //        }
+        //        if ($user['identity']==3){
+        //            $title="市代";
+        //        }
+        //        if ($user['identity']==4){
+        //            $title="商户";
+        //        }
+        //        if ($user['identity']==5){
+        //            $title="推广员";
+        //        }
+        //
+        //        $where[] = Elm::text('identity', $title );
         if ($user['identity']!=0){
             $where[] =Elm::input('mer_rebate', "推荐商户返利");
             $where[] =Elm::input('promoter_rebate', "推荐代理返利");
@@ -308,9 +308,9 @@ class UserRepository extends BaseRepository
         }
         if ($user['identity']==1){
             $where[] =Elm::input('agent_rebate', "推荐推广员返利");
-//            $title="镇代返利";
-//            $where[] =Elm::input('jurisdiction', "辖区内收入");
-//            $where[] =Elm::input('adv_fee', "广告费");
+            //            $title="镇代返利";
+            //            $where[] =Elm::input('jurisdiction', "辖区内收入");
+            //            $where[] =Elm::input('adv_fee', "广告费");
             $where[] =Elm::input('xqxiaofei', "自己辖区消费返利");
         }
         if ($user['identity']==2){
@@ -374,7 +374,7 @@ class UserRepository extends BaseRepository
         $count = Db::name("user_agent")
             ->where($where)
             ->count();
-//        $count =$query->where($where)->count();
+        //        $count =$query->where($where)->count();
         foreach($list as $k=>$value){
             $city['province']  = Db::name("user_province")->where(['province_id'=>$value['province_id']])->value("province_name");
             $city['city']  = Db::name("user_city")->where(['city_id'=>$value['city_id']])->value("city_name");
@@ -440,7 +440,7 @@ class UserRepository extends BaseRepository
         $count5 =  Db::name("user")->where($wheres2)->where("identity", 5 )->count();
         $sart=[
             ['className'=> 'el-icon-s-goods', 'count'=>$count1, 'field'=>'人', 'name'=> '镇级服务商' ], [ 'className'=> 'el-icon-s-goods', 'count'=>$count2, 'field'=> '人', 'name'=>'县级服务商'], [ 'className'=> 'el-icon-s-order', 'count'=> $count3, 'field'=> '人', 'name'=> '市级服务商' ], [ 'className'=> 'el-icon-s-order', 'count'=> $count5, 'field'=> '人', 'name'=> '推广员' ]];
-//        [{ 'className': 'el-icon-s-goods', 'count': '21.00', 'field': '元', 'name': '总支付金额' }, { 'className': 'el-icon-s-goods', 'count': '0.00', 'field': '元', 'name': '服务商返利' }, { 'className': 'el-icon-s-order', 'count': '3.24', 'field': '元', 'name': '养老金' }]
+        //        [{ 'className': 'el-icon-s-goods', 'count': '21.00', 'field': '元', 'name': '总支付金额' }, { 'className': 'el-icon-s-goods', 'count': '0.00', 'field': '元', 'name': '服务商返利' }, { 'className': 'el-icon-s-order', 'count': '3.24', 'field': '元', 'name': '养老金' }]
 
 
         return compact('count', 'list','sart','wheres');
@@ -486,17 +486,17 @@ class UserRepository extends BaseRepository
                 if(empty($item['lx'])){
                     $item['lx'] = '普通用户';
                 }
-//                try {
-//                    $certification = Db::name('user_certification')
-//                        ->where('uid', $item->uid)
-//                        ->find();
-//                    if ($certification) {
-//                        $response = $this->checkAmount($certification);
-//                        $item->gzcAmount = $response['amount'];
-//                    }
-//                } catch (\Throwable $w) {
-//                    $item->gzcAmount = 0;
-//                }
+                //                try {
+                //                    $certification = Db::name('user_certification')
+                //                        ->where('uid', $item->uid)
+                //                        ->find();
+                //                    if ($certification) {
+                //                        $response = $this->checkAmount($certification);
+                //                        $item->gzcAmount = $response['amount'];
+                //                    }
+                //                } catch (\Throwable $w) {
+                //                    $item->gzcAmount = 0;
+                //                }
                 $item->label = count($item['label_id']) ? $make->labels($item['label_id']) : [];
 
                 $user_rich=Db::name('user_rich')->where('uid', $item['uid'])->find();
@@ -504,7 +504,7 @@ class UserRepository extends BaseRepository
                 $item->is_huitian = (isset($user_rich) && $user_rich['is_huitian']==1)?true:false;
                 $item->user_rich_type= (isset($user_rich) )?$user_rich['type']:0;
                 $item->stockholder= (isset($user_rich) )?$user_rich['stockholder']:0;
-//                $area_manage_type=Db::name('area_manage')->where('uid', $item['uid'])->value('type');
+                //                $area_manage_type=Db::name('area_manage')->where('uid', $item['uid'])->value('type');
                 //类型 district-区/县代 city-市代',
                 $item->area_manage_type=$item['user_group'];
                 $item->user_rich=$user_rich;
@@ -625,10 +625,10 @@ class UserRepository extends BaseRepository
         }
 
 
-//        if ($where['status']==2){
-//            unset($data['is_promoter'],$data['promoter_time']);
-//            Db::name("user_agent")->where("user_id",$id)->update(["status"=>2,"update_time"=>time()]);
-//        }
+        //        if ($where['status']==2){
+        //            unset($data['is_promoter'],$data['promoter_time']);
+        //            Db::name("user_agent")->where("user_id",$id)->update(["status"=>2,"update_time"=>time()]);
+        //        }
         return true;
     }
     /**
@@ -703,11 +703,11 @@ class UserRepository extends BaseRepository
      * @param $order_sn
      */
     public function add_bill($title,$number,$uid,$mark,$commission_type,$order_sn,$order_id=0){
-//        $old_number=Db::name("user")->where("uid",$uid)->value("brokerage_price");
+        //        $old_number=Db::name("user")->where("uid",$uid)->value("brokerage_price");
         $data=[
             'link_id' => $order_id,
             "uid"=>$uid,
-//            "pm"=>1,
+            //            "pm"=>1,
             "title"=>$title,
             "category"=>"now_money",
             "type"=>"commission",
@@ -720,7 +720,7 @@ class UserRepository extends BaseRepository
             "order_sn"=>$order_sn,
         ];
         Db::name("user_bill")->insert($data);
-//        Db::name("user")->where("uid",$uid)->inc('brokerage_price', $number) ->update();
+        //        Db::name("user")->where("uid",$uid)->inc('brokerage_price', $number) ->update();
     }
 
     public function merList(string $keyword, $page, $limit)
@@ -832,8 +832,8 @@ class UserRepository extends BaseRepository
             return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
                 Elm::input('spread_account', '业绩归属人账号')->required()->placeholder("请填写业绩归属人手机号")->info('修改业绩归属人后，用户业绩归属至所填写账号下，但邀请关系及其他邀请相关的奖励不变!'),
                 Elm::hidden('type', '1')
-        ])->setTitle('修改业绩归属人');
-    }
+            ])->setTitle('修改业绩归属人');
+        }
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
             Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")
         ])->setTitle('修改用户推荐人');
@@ -916,19 +916,19 @@ class UserRepository extends BaseRepository
                 'last_ip' => $request->ip(),
             ]);
         }
-//        else
-//            $user = $this->create($userType, [
-//                'account' => 'wx' . $wechatUser->wechat_user_id . time(),
-//                'wechat_user_id' => $wechatUser->wechat_user_id,
-//                'pwd' => $this->encodePassword(123456),
-//                'nickname' => $wechatUser['nickname'] ?: '',
-//                'avatar' => $wechatUser['headimgurl'] ?: '',
-//                'sex' => $wechatUser['sex'] ?: 0,
-//                'spread_uid' => 0,
-//                'is_promoter' => 0,
-//                'last_time' => date('Y-m-d H:i:s'),
-//                'last_ip' => $request->ip()
-//            ]);
+        //        else
+        //            $user = $this->create($userType, [
+        //                'account' => 'wx' . $wechatUser->wechat_user_id . time(),
+        //                'wechat_user_id' => $wechatUser->wechat_user_id,
+        //                'pwd' => $this->encodePassword(123456),
+        //                'nickname' => $wechatUser['nickname'] ?: '',
+        //                'avatar' => $wechatUser['headimgurl'] ?: '',
+        //                'sex' => $wechatUser['sex'] ?: 0,
+        //                'spread_uid' => 0,
+        //                'is_promoter' => 0,
+        //                'last_time' => date('Y-m-d H:i:s'),
+        //                'last_ip' => $request->ip()
+        //            ]);
 
         return $user;
     }
@@ -951,16 +951,16 @@ class UserRepository extends BaseRepository
             $user = $this->dao->create($userInfo); //创建用户
             $this -> insterUser($user->uid, $spread_uid);
             //唯品会pid
-//            $vip = app()->make(Vip::class);
-//            $vip->create_pid($user->uid);
-//            //拼多多pid
-//            $taoke = app()->make(TaoKe::class);
-//            $taoke->generateAd($user->uid);
-//            //京东pid(改成京京推推就)
-//            $jd = app()->make(Jd::class);
-//            $jd->create_pid($user->uid);
-//
-//            Queue::push(SendNewPeopleCouponJob::class, $user->uid);
+            //            $vip = app()->make(Vip::class);
+            //            $vip->create_pid($user->uid);
+            //            //拼多多pid
+            //            $taoke = app()->make(TaoKe::class);
+            //            $taoke->generateAd($user->uid);
+            //            //京东pid(改成京京推推就)
+            //            $jd = app()->make(Jd::class);
+            //            $jd->create_pid($user->uid);
+            //
+            //            Queue::push(SendNewPeopleCouponJob::class, $user->uid);
 
             //赠送积分 注册送30积分
             $this->sign_add($user['uid'], 30,1,'注册送30积分','','', '', 1, '', 1);
@@ -988,41 +988,41 @@ class UserRepository extends BaseRepository
         /**
          * 查询上级人数  select * from rrx_user_count LIMIT 0,1
          */
-//        $spread_uid = Db::name('user') -> where('uid', $uid) -> value('spread_uid');
-//        Db::name('log')->insert(['data'=>'公排注册：'.$uid.'======'.$spread_uid]);
-//        $userCount = false;
-//        if ($spread_uid > 0){
-//            //找直推上级网络里面不足5人的排进去
-//
-//            $userCount = Db::name('user_count') -> where('level_number >= 0') -> where ('uid', $spread_uid) -> find();
-//            if (!$userCount){
-//                $userCount = $this -> getCountUId($spread_uid);
-//            }
-//
-//
-//        }
+        //        $spread_uid = Db::name('user') -> where('uid', $uid) -> value('spread_uid');
+        //        Db::name('log')->insert(['data'=>'公排注册：'.$uid.'======'.$spread_uid]);
+        //        $userCount = false;
+        //        if ($spread_uid > 0){
+        //            //找直推上级网络里面不足5人的排进去
+        //
+        //            $userCount = Db::name('user_count') -> where('level_number >= 0') -> where ('uid', $spread_uid) -> find();
+        //            if (!$userCount){
+        //                $userCount = $this -> getCountUId($spread_uid);
+        //            }
+        //
+        //
+        //        }
         // Log::info("userCount:::");
         // Log::info($userCount);
         // Log::info($spread_uid);
 
-//        Db::name('log')->insert(['data'=>'uid：'.$uid.'公排注册：'.json_encode($userCount)]);
-//        if (!$userCount){
-//            //没有直推上级 大公排
-//            $userCount = Db::name('user_count') -> where('level_number >= 0') -> find();
-//            //增加一个只查询新账户大公排下的用户
-//            // $userCount = Db::name('user_count') -> where('level_number >= 0')->whereIn('uid',$this->getUserLevelId(11112)) -> find();
-//        }
-//        if ($userCount) {
-//            if ($userCount['level_number'] + 1 == systemConfig( 'max_level_number')) {  //（33制或者55制）下级最大人数systemConfig( 'max_level_number')
-//                Db::name('user_count') -> where('uid',$userCount['uid'])->delete();
-//            } else {
-//                $level_number = $userCount['level_number'] + 1;
-//                Db::name('user_count') -> where('uid',$userCount['uid']) -> update(['level_number'=>$level_number]);
-//            }
-//        }
+        //        Db::name('log')->insert(['data'=>'uid：'.$uid.'公排注册：'.json_encode($userCount)]);
+        //        if (!$userCount){
+        //            //没有直推上级 大公排
+        //            $userCount = Db::name('user_count') -> where('level_number >= 0') -> find();
+        //            //增加一个只查询新账户大公排下的用户
+        //            // $userCount = Db::name('user_count') -> where('level_number >= 0')->whereIn('uid',$this->getUserLevelId(11112)) -> find();
+        //        }
+        //        if ($userCount) {
+        //            if ($userCount['level_number'] + 1 == systemConfig( 'max_level_number')) {  //（33制或者55制）下级最大人数systemConfig( 'max_level_number')
+        //                Db::name('user_count') -> where('uid',$userCount['uid'])->delete();
+        //            } else {
+        //                $level_number = $userCount['level_number'] + 1;
+        //                Db::name('user_count') -> where('uid',$userCount['uid']) -> update(['level_number'=>$level_number]);
+        //            }
+        //        }
         // dd($spread_uid);
-//        Db::name('user') -> where('uid',$uid)->update(['level_id'=>$userCount['uid'],'level'=>$this->level()]);
-//        Db::name('user_count') -> insert(['uid'=>$uid]);
+        //        Db::name('user') -> where('uid',$uid)->update(['level_id'=>$userCount['uid'],'level'=>$this->level()]);
+        //        Db::name('user_count') -> insert(['uid'=>$uid]);
     }
 
     public function getCountUId($spread_uid){
@@ -1075,10 +1075,10 @@ class UserRepository extends BaseRepository
         if($user -> user_number == ''){
             $this -> createUserNumber($user->uid);
         }
-//        if($user -> im == 0 && env('im',false)){
-//            $im = new Im();
-//            $im -> createIm($user -> account,$user -> user_number);
-//        }
+        //        if($user -> im == 0 && env('im',false)){
+        //            $im = new Im();
+        //            $im -> createIm($user -> account,$user -> user_number);
+        //        }
         return $token;
     }
 
@@ -1210,7 +1210,7 @@ class UserRepository extends BaseRepository
     }
     public function addregistr($data)
     {
-//        string $phone, ?string $pwd, $user_type = 'h5',$url,
+        //        string $phone, ?string $pwd, $user_type = 'h5',$url,
         $phone=$data['phone'];
         $pwd=empty($data['password'])?time():$data['password'];
 
@@ -1437,15 +1437,15 @@ class UserRepository extends BaseRepository
                         'fontColor' => '0,0,0',       //字体颜色
                         'angle' => 0,
                     ),
-//                    array(
-//                        'text' => '邀请您加入' . $siteName,
-//                        'left' => 290,
-//                        'top' => 750,
-//                        'fontPath' => $filelink['Normal'],     //字体文件
-//                        'fontSize' => 16,             //字号
-//                        'fontColor' => '40,40,40',       //字体颜色
-//                        'angle' => 0,
-//                    )
+                    //                    array(
+                    //                        'text' => '邀请您加入' . $siteName,
+                    //                        'left' => 290,
+                    //                        'top' => 750,
+                    //                        'fontPath' => $filelink['Normal'],     //字体文件
+                    //                        'fontSize' => 16,             //字号
+                    //                        'fontColor' => '40,40,40',       //字体颜色
+                    //                        'angle' => 0,
+                    //                    )
                 ),
                 'background' => $item['pic']
             );
@@ -1558,7 +1558,7 @@ class UserRepository extends BaseRepository
         }
 
         //绑定上下级关系 加入推广群
-//        $this -> hximTg($user -> uid,$spreadUid);
+        //        $this -> hximTg($user -> uid,$spreadUid);
     }
 
     /**
@@ -1702,7 +1702,7 @@ class UserRepository extends BaseRepository
     public function getLevelList($uid, array $where, $page, $limit)
     {
         if (!$where['level']) {
-//            $ids = $this->dao->getSubIds($uid);
+            //            $ids = $this->dao->getSubIds($uid);
             $ids[] = $uid;
             $where['spread_uids'] = $ids;
         } else if ($where['level'] == 2) {
@@ -1915,7 +1915,7 @@ class UserRepository extends BaseRepository
                 'balance' =>$now_score
             ]);
             Db::name('user')->where( array('uid' => $member_id) )->update(['now_score'=>$now_score]);
-//            Db::name('log')->insert(['data'=>Db::name('user')->getLastSql(),'time'=>date('Y-m-d H:i:s',time())]);
+            //            Db::name('log')->insert(['data'=>Db::name('user')->getLastSql(),'time'=>date('Y-m-d H:i:s',time())]);
             return  array('code' =>0, 'now_score' => $score, 'continuity_day' => $has_qian,'reward_socre' => $get_score );
         }
     }
@@ -2028,14 +2028,14 @@ class UserRepository extends BaseRepository
             }
         }
         //判断是不是商户
-//        if($user['identity']==4){
-//            return  ['code'=>'400','msg'=>"不符合申请代理的条件"];
-//        }
+        //        if($user['identity']==4){
+        //            return  ['code'=>'400','msg'=>"不符合申请代理的条件"];
+        //        }
 
         //判断用户是否是其他代理身份
-//        if(in_array($user['identity'],[1,2,3,5])){
-//            return  ['code'=>'400','msg'=>"用户已是推广身份"];
-//        }
+        //        if(in_array($user['identity'],[1,2,3,5])){
+        //            return  ['code'=>'400','msg'=>"用户已是推广身份"];
+        //        }
         if($user['identity']==$data['identity']){
             return  ['code'=>'400','msg'=>"用户已是该身份，无需申请"];
         }
@@ -2166,11 +2166,11 @@ class UserRepository extends BaseRepository
     public function get_profit_info($member_id,$where){
 
 
-//        $data["count_yj"]=Db::name("user")->where(["type"=>"commission"])->sum("number");
-//        $data["dlfee"]=Db::name("user")->where(["type"=>"commission","commission_type"=>1])->sum("number");
-//        $data["xiaofee"]=Db::name("user")->where(["type"=>"commission","commission_type"=>2])->sum("number");;
-//        $data["county"] =Db::name("user")->where(["type"=>"commission","commission_type"=>1])->sum("number");;
-//        $data["town"]==Db::name("user")->where(["type"=>"commission","commission_type"=>1])->sum("number");;
+        //        $data["count_yj"]=Db::name("user")->where(["type"=>"commission"])->sum("number");
+        //        $data["dlfee"]=Db::name("user")->where(["type"=>"commission","commission_type"=>1])->sum("number");
+        //        $data["xiaofee"]=Db::name("user")->where(["type"=>"commission","commission_type"=>2])->sum("number");;
+        //        $data["county"] =Db::name("user")->where(["type"=>"commission","commission_type"=>1])->sum("number");;
+        //        $data["town"]==Db::name("user")->where(["type"=>"commission","commission_type"=>1])->sum("number");;
         $query = Db::name("user_bill")->where(["type"=>"commission",'uid'=>$member_id])
             ->field("type,number,status,commission_type,create_time,uid,title,order_sn");
 
@@ -2198,7 +2198,7 @@ class UserRepository extends BaseRepository
         $weijiesuan=0;
         $qudao=0;
         foreach ($list as &$v){
-//            $count_yj=$v["number"]+$count_yj;
+            //            $count_yj=$v["number"]+$count_yj;
 
             if ($v["status"]==0){
                 $v["title"]="【预估】".$v["title"].",单号：".$v["order_sn"];
@@ -2269,7 +2269,7 @@ class UserRepository extends BaseRepository
         $ptjl=0;
         $qudao=0;
         foreach ($list as &$v){
-//            $count_yj=$v["number"]+$count_yj;
+            //            $count_yj=$v["number"]+$count_yj;
 
             if ($v["commission_type"]==1){
                 $dlfee+=$v["number"];
@@ -2300,10 +2300,10 @@ class UserRepository extends BaseRepository
                 $tuiguang+=$v["number"];
                 $v['title'] = '推荐商户奖励佣金';
             }
-//            if ($v['type_shop'] >0){
-//                $qudao+=$v['number'];
-//                $v['title'] = '第三方订单获取佣金';
-//            }
+            //            if ($v['type_shop'] >0){
+            //                $qudao+=$v['number'];
+            //                $v['title'] = '第三方订单获取佣金';
+            //            }
 
         }
         $data["count_yj"]=round($dangqian_yj,2);//当前佣金
@@ -2371,7 +2371,7 @@ class UserRepository extends BaseRepository
 
         $list= $query->order("create_time desc")->page($page,$limit)->select()->toArray();
         foreach ($list as &$v){
-//            $v["create_time"]=date("Y-m-d", $v["create_time"]);
+            //            $v["create_time"]=date("Y-m-d", $v["create_time"]);
             //0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么
             if($v['type_shop'] == 0){
 
@@ -2399,8 +2399,8 @@ class UserRepository extends BaseRepository
                 $this -> getContent('order_su',$v['order_sn'],'苏宁易购',$v['status'],$v['commission_type'],$v);
             }
             elseif ($v['type_shop'] == '4'){
-//                $uid = Db::name('order_jd')->where("order_sn",$v["order_sn"])->value("uid");
-//                $v["nickname"]=$this -> getUserNickname($uid);
+                //                $uid = Db::name('order_jd')->where("order_sn",$v["order_sn"])->value("uid");
+                //                $v["nickname"]=$this -> getUserNickname($uid);
                 $v["nickname"]='';
                 $v['content'] = $v['nickname'].'在网易考拉消费，帮您攒金';
                 $v['xiadan'] = '';
@@ -2455,14 +2455,14 @@ class UserRepository extends BaseRepository
                 $v["nickname"]=$this -> getUserNickname($res['uid']);
                 $v['content'] = $yugu.$v['nickname'].'在'.$title.'消费，帮您攒金';
         }
-//        $v['xiadan'] = $res['create_time'] ?? $create_time;
+        //        $v['xiadan'] = $res['create_time'] ?? $create_time;
         $v['xiadan'] = isset($res['pay_time'])?$res['pay_time']:$create_time;
         $v['jiesuan'] = $v['xiadan'];
-//        if (empty($res['bill_end_time']) && empty($res['create_time'])){
-//            $v['jiesuan'] = $create_time;
-//        }else{
-//            $v['jiesuan'] = date('Y-m-d H:i:s',$res['bill_end_time']??strtotime("+10 day", strtotime($res['create_time'])));
-//        }
+        //        if (empty($res['bill_end_time']) && empty($res['create_time'])){
+        //            $v['jiesuan'] = $create_time;
+        //        }else{
+        //            $v['jiesuan'] = date('Y-m-d H:i:s',$res['bill_end_time']??strtotime("+10 day", strtotime($res['create_time'])));
+        //        }
     }
 
 
@@ -2473,7 +2473,7 @@ class UserRepository extends BaseRepository
         $where=["ul.type"=>"commission","ul.status"=>1,'ul.uid'=>$member_id];
         $list=Db::name("user_bill")
             ->alias("ul")
-//            ->join("user u","u.uid=ul.uid")
+            //            ->join("user u","u.uid=ul.uid")
             ->where("commission_type","<>",5)
             ->where($where)
             ->field("ul.mark,ul.bill_id,ul.type,ul.number,ul.status,ul.create_time,ul.uid,ul.order_sn,ul.create_time,ul.link_id")
@@ -2483,7 +2483,7 @@ class UserRepository extends BaseRepository
         foreach ($list as &$v){
 
             $num++;
-//            $v["create_time"]=date("Y-m-d", $v["create_time"]);
+            //            $v["create_time"]=date("Y-m-d", $v["create_time"]);
             $uid=Db::name("store_order")->where("order_sn",$v["order_sn"])->value("uid");
             $v["nickname"]=Db::name("user")->where("uid", $uid)->value("nickname");
             $count+=$v["number"];
@@ -2497,40 +2497,40 @@ class UserRepository extends BaseRepository
             ->where("uid",$member_id)
             ->field("wechat_user_id,card_id,ali_user_id,annuity_frozen,annuity_num,annuity,create_time,birthday,birthday60,card_number,annuity_yiqu,pay_price")
             ->find();
-//        $data['annuity'] = 0;
+        //        $data['annuity'] = 0;
         $certification = Db::name("user_certification")->where("uid",$member_id)->find();
         $data['can_withdraw'] = 0;
         if (!$certification || $certification["status"] !=1 || !$certification["user_card"]){
             $data["birthday60"] = "未实名认证";
             $data['is_certification'] = 0;
         } else {
-//            try {
-//                $checkAmount = $this->checkAmount($certification);
-//                if ($checkAmount['code'] == 0) {
-//                    $data['annuity'] = $checkAmount['extendData']['amount'];
-//                }
-//            } catch (\Throwable $e) {
-//               Log::info('getyanglaojin' . $e->getMessage());
-//            }
+            //            try {
+            //                $checkAmount = $this->checkAmount($certification);
+            //                if ($checkAmount['code'] == 0) {
+            //                    $data['annuity'] = $checkAmount['extendData']['amount'];
+            //                }
+            //            } catch (\Throwable $e) {
+            //               Log::info('getyanglaojin' . $e->getMessage());
+            //            }
             $data['is_certification'] = 1;
             $birth_data = substr($certification["user_card"], 6, 8);
-//            $birth = strtotime(substr($certification["user_card"], 6, 8));
+            //            $birth = strtotime(substr($certification["user_card"], 6, 8));
             $old_age = $this->getSex($certification["user_card"])?60:55;
-//            $age = $this->howOld($birth);
+            //            $age = $this->howOld($birth);
             $age=$this->calculateAge($birth_data);
 
             if ($age < $old_age) {
-//                $yes = $old_age - $age;
-//                $data["birthday60"] = date("Y-" . substr($birth_data, 4, 2) . '-' . substr($birth_data, 6, 2), strtotime("+" . $yes . " year"));
+                //                $yes = $old_age - $age;
+                //                $data["birthday60"] = date("Y-" . substr($birth_data, 4, 2) . '-' . substr($birth_data, 6, 2), strtotime("+" . $yes . " year"));
             }
             if ($age == $old_age) {
                 $data['can_withdraw'] = 1;
-//                $data["birthday60"] = date("Y-m-d", $birth);
+                //                $data["birthday60"] = date("Y-m-d", $birth);
             }
             if ($age > $old_age) {
                 $data['can_withdraw'] = 1;
-//                $yes = $age - $old_age;
-//                $data["birthday60"] = date("Y-" . substr($birth_data, 4, 2) . '-' . substr($birth_data, 6, 2), strtotime("-" . $yes . " year"));
+                //                $yes = $age - $old_age;
+                //                $data["birthday60"] = date("Y-" . substr($birth_data, 4, 2) . '-' . substr($birth_data, 6, 2), strtotime("-" . $yes . " year"));
             }
             //收益余额
             $data['annuity_num'] = 123;
@@ -2550,7 +2550,7 @@ class UserRepository extends BaseRepository
         //加上线下消费的
         $data['pay_price'] = bcadd($data['pay_price'],$order_merchant_price,2);
         $data["yinghang"] = "中信公证处消费养老金账户";
-//        $data["yinghang"]='https://app.bjtdba.com/uploads/def/20201021/8cb66944101287b8ac9c9b9fb1b13a79.png';
+        //        $data["yinghang"]='https://app.bjtdba.com/uploads/def/20201021/8cb66944101287b8ac9c9b9fb1b13a79.png';
         $data["add_up"] = 0.00;
 
 
@@ -2654,7 +2654,7 @@ class UserRepository extends BaseRepository
         foreach ($data as $k=>&$v){
 
             if($v['withdrawal_type']==2){
-//                $name=Db::name('merchant')->where('mer_id',$v['mer_id'])->value('mer_name');
+                //                $name=Db::name('merchant')->where('mer_id',$v['mer_id'])->value('mer_name');
                 $v['title']='佣金提现';
             }else if($v['withdrawal_type']==3){
                 if($v['extract_type']==1){
@@ -2690,7 +2690,7 @@ class UserRepository extends BaseRepository
         foreach ($data as $k=>&$v){
 
             if($v['withdrawal_type']==2){
-//                $name=Db::name('merchant')->where('mer_id',$v['mer_id'])->value('mer_name');
+                //                $name=Db::name('merchant')->where('mer_id',$v['mer_id'])->value('mer_name');
                 $v['title']='佣金提现';
             }else if($v['withdrawal_type']==3){
                 if($v['extract_type']==1){
@@ -2977,7 +2977,7 @@ class UserRepository extends BaseRepository
             $data['wechat_user_id'] = $third_user_id;
         }elseif($type ==2){
             if(isset($user->ali_user_id) && $user->ali_user_id){return true;}
-//            if($user->ali_user_id){return true;}
+            //            if($user->ali_user_id){return true;}
             $data['ali_user_id'] = $third_user_id;
         }
         if(!$user){
@@ -3162,26 +3162,26 @@ class UserRepository extends BaseRepository
         }
 
         return false;
-//            $phone_data=Db::name('system_role')->whereIn('role_id',$roles_str)->where("phone !=''")->group("phone")->column('phone');
-//            if($phone_data){
-//                $uid_data = Db::name('user')->whereIn('phone', $phone_data)->column('uid');
-//                if($uid_data){
-//                    $uids=$this->level_list($uid_data,0);
-//                }
-//            }
-//        }
-//        return isset($uids)?$uids:[];
-    }
-//    function level_list($uid_data,$i){
-//        $i++;
-//        $uid = Db::name('user')->whereIn('level_id', $uid_data)->column('uid');
-//        if($uid && $i<9){
-//            $uid_data=array_merge($uid_data,$uid);
-//            return $this->level_list($uid_data,$i);
-//        }else{
-//            return $uid_data;
-//        }
-//    }
+        //            $phone_data=Db::name('system_role')->whereIn('role_id',$roles_str)->where("phone !=''")->group("phone")->column('phone');
+        //            if($phone_data){
+        //                $uid_data = Db::name('user')->whereIn('phone', $phone_data)->column('uid');
+        //                if($uid_data){
+        //                    $uids=$this->level_list($uid_data,0);
+        //                }
+        //            }
+        //        }
+        //        return isset($uids)?$uids:[];
+    }
+    //    function level_list($uid_data,$i){
+    //        $i++;
+    //        $uid = Db::name('user')->whereIn('level_id', $uid_data)->column('uid');
+    //        if($uid && $i<9){
+    //            $uid_data=array_merge($uid_data,$uid);
+    //            return $this->level_list($uid_data,$i);
+    //        }else{
+    //            return $uid_data;
+    //        }
+    //    }
 
     public function sign_yhc_add($uid,$mer_id,$score,$mark,$order_id=0,$pm=1,$use_uid=0){
         $ins_data['uid'] = $uid;
@@ -3676,7 +3676,7 @@ class UserRepository extends BaseRepository
                 foreach ($contributeInfoList as $value) {
                     // 跳过时间范围外的 贡献值
                     if (!empty($startTime) && strtotime($value['settlementTime']) < strtotime($startTime)) {
-                        break;
+                        continue;
                     }
                     if (!empty($endTime) && strtotime($value['settlementTime']) > strtotime($endTime)) {
                         break;
@@ -3721,20 +3721,21 @@ class UserRepository extends BaseRepository
             foreach ($uidContributeList as $uidContribute) {
                 $goOnDepth = $depth;
                 // 获取用户规定时间内 所产生的贡献值 第一级
-                $userContributionSumMap[$uidContribute['uid']][0] = $subordinatesOfCurrentLevelUidList[$uidContribute['uid']] ?? 0;
+                $userContributionSumMap[$uidContribute['uid']]['0'] = $subordinatesOfCurrentLevelUidList[$uidContribute['uid']] ?? 0;
                 if ($depth == 1) {
-                    break;
+                    continue;
                 } else if ($depth > 1){
                     $goOnDepth = $depth - 1;
                 }
                 // 获取每个下级（部门）的个人贡献值 $goOnDepth = 0 时表示无限递归
-                $userContributionSumMap[$uidContribute['uid']] = $this->getContributionSumByLevel(
+                $contributionSumByLevel = $this->getContributionSumByLevel(
                     [$uidContribute['uid']],
                     $goOnDepth,
                     0,
                     $startTime,
                     $endTime
                 );
+                $userContributionSumMap[$uidContribute['uid']] = array_merge($userContributionSumMap[$uidContribute['uid']], $contributionSumByLevel);
 
                 if (!empty($userContributionSumMap[$uidContribute['uid']])) {
                     ksort($userContributionSumMap[$uidContribute['uid']]);