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

app/common/repositories/user/UserRepository.php

@@ -2587,7 +2587,7 @@ class UserRepository extends BaseRepository
 
         return $age;
     }
-    public function yanglaolog($where,$page=1, $limit=10,$month=''){
+    public function yanglaolog($where,$page=1, $limit=10,$month='',$is_shixiao = 0){
         $where1 = [];
         if(!empty($where)){
             foreach($where as $key => $value){
@@ -2602,7 +2602,10 @@ class UserRepository extends BaseRepository
             ->when($month!='',function ($q) use ($month){
                 $q->whereLike('a.create_time',$month.'%');
             });
-        $query -> where('a.status','<>','-1');
+
+        if($is_shixiao == 0){
+            $query -> where('a.status','<>','-1');
+        }
         $query_sql1 = clone $query;
         $query_sql2 = clone $query;
         $query_sql3 = clone $query;
@@ -3280,12 +3283,59 @@ class UserRepository extends BaseRepository
 
         // 3、获取个人贡献值
         $userData = $this->dao->get($uid)->toArray();
-        if ($userData['is_old'] == 1 && $userData['user_group'] > 1 && empty($userData['identity_up_time'])) {
-            if (empty($userData['create_time'])) {
-                return $userData['user_group'];
+        // 这一步骤是为了 确定用户升级时间，因为后边的团队贡献值，需要查询 用户 升级为业务员后 所产生的团队贡献值
+        if (empty($userData['identity_up_time'])) {
+            // 老用户的身份 升级时间已无法确定， 则采用用户的创建时间
+            if ($userData['is_old'] == 1 && $userData['user_group'] > 1) {
+                if (empty($userData['create_time'])) {
+                    return $userData['user_group'];
+                }
+                $userData['identity_up_time'] = $userData['create_time'];
+                $this->dao->update($uid, ['identity_up_time' => $userData['identity_up_time']]);
+            }
+            // 如果是新用户 则 根绝他的贡献值记录表 确认成为业务员的时间
+            if ($userData['is_old'] == 0) {
+                $upArriveNumOwn = 0;
+                $yeWuYuanId = 0;
+                foreach ($identityList as $value) {
+                    if ($value['user_group_name'] == '业务员') {
+                        $upArriveNumOwn = $value['arrive_num_own'];
+                        $yeWuYuanId = $value['user_group_id'];
+                        break;
+                    }
+                }
+                if (!empty($upArriveNumOwn)) {
+                    $userSignGongxianList = Db::name('user_sign_gongxian')
+                        ->where('uid', $uid)
+                        ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
+                        ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
+                        ->order('id asc')
+                        ->field('uid, number, type, settlement_time') // 只需要下级的uid和贡献值
+                        ->select()
+                        ->toArray();
+                    $myArriveNumOwn = 0;
+                    $myIdentityUpTime = '';
+                    foreach ($userSignGongxianList as $value) {
+                        if ($value['type'] == 1) {
+                            $myArriveNumOwn += $value['number'];
+                        } else {
+                            $myArriveNumOwn -= $value['number'];
+                        }
+                        if ($myArriveNumOwn >= $upArriveNumOwn) {
+                            $myIdentityUpTime = $value['settlement_time'];
+                            break;
+                        }
+                    }
+                    if (!empty($myIdentityUpTime) && !empty($yeWuYuanId)) {
+                        $userData['identity_up_time'] = $myIdentityUpTime;
+                        $userData['user_group'] = $yeWuYuanId;
+                        $this->dao->update($uid, [
+                            'identity_up_time' => $myIdentityUpTime,
+                            'user_group' => $yeWuYuanId
+                        ]);
+                    }
+                }
             }
-            $userData['identity_up_time'] = $userData['create_time'];
-            $this->dao->update($uid, ['identity_up_time' => $userData['identity_up_time']]);
         }
         if ($userData['user_group'] == 1) {
             $maxLvRestrict = 2;
@@ -3532,4 +3582,112 @@ class UserRepository extends BaseRepository
 
         return $levelContributions;
     }
+
+    public function getUserContributeInfoByDepth($uid, $depth = 10)
+    {
+        // 3、获取个人贡献值
+        $userData = $this->dao->get($uid)->toArray();
+        // 这一步骤是为了 确定用户升级时间，因为后边的团队贡献值，需要查询 用户 升级为业务员后 所产生的团队贡献值
+        if (empty($userData['identity_up_time'])) {
+            // 老用户的身份 升级时间已无法确定， 则采用用户的创建时间
+            if ($userData['is_old'] == 1 && $userData['user_group'] > 1) {
+                if (empty($userData['create_time'])) {
+                    return $userData['user_group'];
+                }
+                $userData['identity_up_time'] = $userData['create_time'];
+                $this->dao->update($uid, ['identity_up_time' => $userData['identity_up_time']]);
+            }
+            // 如果是新用户 则 根绝他的贡献值记录表 确认成为业务员的时间
+            if ($userData['is_old'] == 0) {
+                $upArriveNumOwn = 0;
+                $yeWuYuanId = 0;
+                // 1、获取所有等级信息
+                /** @var UserIdentityRepository $identityRepository */
+                $identityRepository = app()->make(UserIdentityRepository::class);
+                $identityList = $identityRepository->getIdentityList();
+                foreach ($identityList as $value) {
+                    if ($value['user_group_name'] == '业务员') {
+                        $upArriveNumOwn = $value['arrive_num_own'];
+                        $yeWuYuanId = $value['user_group_id'];
+                        break;
+                    }
+                }
+                if (!empty($upArriveNumOwn)) {
+                    $userSignGongxianList = Db::name('user_sign_gongxian')
+                        ->where('uid', $uid)
+                        ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
+                        ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
+                        ->order('id asc')
+                        ->field('uid, number, type, settlement_time') // 只需要下级的uid和贡献值
+                        ->select()
+                        ->toArray();
+                    $myArriveNumOwn = 0;
+                    $myIdentityUpTime = '';
+                    foreach ($userSignGongxianList as $value) {
+                        if ($value['type'] == 1) {
+                            $myArriveNumOwn += $value['number'];
+                        } else {
+                            $myArriveNumOwn -= $value['number'];
+                        }
+                        if ($myArriveNumOwn >= $upArriveNumOwn) {
+                            $myIdentityUpTime = $value['settlement_time'];
+                            break;
+                        }
+                    }
+                    if (!empty($myIdentityUpTime) && !empty($yeWuYuanId)) {
+                        $userData['identity_up_time'] = $myIdentityUpTime;
+                        $userData['user_group'] = $yeWuYuanId;
+                        $this->dao->update($uid, [
+                            'identity_up_time' => $userData['identity_up_time'],
+                            'user_group' => $yeWuYuanId
+                        ]);
+                    }
+                }
+            }
+        }
+
+        // 如果用户身份是  用户  则
+        /**
+         * （1）达标贡献值=自己消费产生的贡献值
+         * （2）团队达标贡献值=小区团队的贡献值（用户的团队贡献值只统计一级）；如果团队只有一人，那团队贡献值就是0
+         */
+        if ($userData['user_group'] == 1) {
+            $depth = 1;
+        }
+
+        // 4、获取下级用户 贡献值
+        $userContributionSumMap = [];
+        // 获取用户的直属下级
+        $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
+        foreach ($uidContributeList as $uidContribute) {
+            // 获取每个下级（部门）的个人贡献值
+            $userContributionSumMap[$uidContribute['uid']] = $this->getContributionSumByLevel(
+                [$uidContribute['uid']],
+                $depth,
+                $userData['is_old'],
+                $userData['identity_up_time'] ?? null
+            );
+            $userContributionSumMap[$uidContribute['uid']][0] = $uidContribute['contribute'];
+            // 假设 老大的 下级是 张三和李四， 董事（最高级身份）需要循环最深的等级是 3 级    得出来的结果↓  这样是为了计算大小部门
+            // $userContributionSumMap[直属下级（部门）张三] =>[0 => 张三个人贡献值, 1 => 张三所有下级用户的个人贡献值, 2 => 张三所有下级用户的下级用户贡献值]
+            // $userContributionSumMap[直属下级（部门）李四] =>[0 => 李四个人贡献值, 1 => 李四所有下级用户的个人贡献值, 2 => 李四所有下级用户的下级用户贡献值]
+        }
+
+        $subordinateContribution = [];
+        foreach ($userContributionSumMap as $key => $value) {
+            $subordinateContribution[$key] = array_sum($value);
+        }
+        $arriveNumTeam = 0;
+        if (!empty($subordinateContribution)) {
+            // 大区业绩
+            $dqYj = max($subordinateContribution);
+            // 总业绩
+            $zYj = array_sum($subordinateContribution);
+            // 小区团体业绩
+            $arriveNumTeam = bcsub($zYj, $dqYj, 2);
+        }
+
+        return ['arriveNumTeam' => $arriveNumTeam, 'contribute' => $userData['contribute'], 'per_contribute' => $userData['per_contribute']];
+
+    }
 }

app/controller/api/user/User.php

@@ -219,17 +219,23 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 1,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_hongbao')->where($where)->where('type',1)->where('status',1)->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
             $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 2,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
-            $data = DB::name('user_sign_hongbao')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_hongbao')->where($where)->where('type',1)->where([['status','in','-1,0']])->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -310,6 +316,19 @@ class User extends BaseController
         log::info("============gongxianinfo");
         $user = $this->request->userInfo();
         if($user->uid>0){
+            $con = DB::name('user')->where('uid', $user->uid)->find();
+            // 先去更新一下用户身份
+            $number = Db::name("system_config_value")->where(["config_key" => "team_commission_recursion_depth"])->value("value");
+            $this->repository->setUserIdentity($user->uid);
+            $result = $this->repository->getUserContributeInfoByDepth($user->uid, $number);
+            $data = [
+                'no_total_source' => Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number'),
+                'team_gongxian_num' => $result['arriveNumTeam'],
+                'zhitui' => $con['per_contribute'],
+                'total_source' => $con['contribute']
+            ];
+            return app('json')->success($data);
+
 
            // $dateObj=DB::name('user_sign_gongxian')->where('uid', $user->uid)->where("status",1)->select();
             $con = DB::name('user')->where('uid', $user->uid)->find();
@@ -408,17 +427,24 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('status',1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
 //        if($pm==1){
 //            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 //
 //        }
         if($pm==2){
-            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where([['status','in','-1,0']])->field('id,mark,number,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -490,15 +516,23 @@ class User extends BaseController
         $where['uid'] = $uid;
 
         if ($pm==0){
-            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where('status', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where('status',1)->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
         if($pm==1){
             $data = DB::name('user_sign_fugou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==2){
-            $data = DB::name('user_sign_fugou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where([['status','in','-1,0']])->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -1143,8 +1177,16 @@ class User extends BaseController
         if ($source > -1) {
             $where['source'] = $source;
         }
-        $res = $this->repository->yanglaolog($where, $page, $limit, $month);
+        $res = $this->repository->yanglaolog($where, $page, $limit, $month,1);
         if ($res) {
+            $res['list'] = $res['list']->toArray();
+            if($res['list']){
+                foreach ($res['list'] as $k=>$v){
+                    if($v['status'] == -1){
+                        $res['list'][$k]['mer_name'] = $v['mer_name'] . '(失效)';
+                    }
+                }
+            }
             return app('json')->success($res);
         } else {
             return app('json')->fail('获取失败');
@@ -2182,17 +2224,24 @@ class User extends BaseController
 //        }
         if ($pm==0){
 
-            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->where('status', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->where('status',1)->field('id,mark,reward_socre,pm,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
         if($pm==1){
             $data = DB::name('user_sign_score')->where($where)->where('pm', 2)->where('status', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
-            $data = DB::name('user_sign_score')->where($where)->where('status', -1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_score')->where($where)->where([['status','in','-1,0']])->field('id,mark,reward_socre,pm,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
 
     }
@@ -2264,6 +2313,10 @@ class User extends BaseController
             if ($v['status'] == 1) {
 //                $v['create_time'] = $v['take_time'];
             }
+            if ($v['status'] == -1) {
+                $v['mark'] = '(失效)' . $v['mark'];
+                $v['status'] = 0;
+            }
 
             $data_arr[] = $v;
         }