优化计算团队贡献值逻辑

app/common/repositories/user/UserRepository.php

@@ -3284,59 +3284,9 @@ class UserRepository extends BaseRepository
         // 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;
-                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
-                        ]);
-                    }
-                }
-            }
-        }
+        $determineResult = $this->determineUserUpgradeTime($uid);
+        $userData['user_group'] = $determineResult['user_group'];
+        $userData['identity_up_time'] = $determineResult['identity_up_time'];
         if ($userData['user_group'] == 1) {
             $maxLvRestrict = 2;
         }
@@ -3414,6 +3364,11 @@ class UserRepository extends BaseRepository
 
     /**
      * 获取该会员的所有下级会员
+     * @param array $uidList
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      */
     public function getUidContributeListBySpreadUidList(array $uidList)
     {
@@ -3433,14 +3388,15 @@ class UserRepository extends BaseRepository
      *                      1 表示只计算第1层（直接下级）的总贡献。
      *                      N 表示计算到第 N 层（包含第N层）的总贡献。
      * @param int $is_old
-     * @param null $identity_up_time
+     * @param null $startTime
+     * @param null $endTime
      * @return array 返回一个数组，键是层级号（从1开始），值是该层级所有用户的贡献值总和。
      *               例如：[ 1 => 600, 2 => 1300 ]
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
      */
-    public function getContributionSumByLevel(array $initialUserIds, int $maxDepth = 0, $is_old = 0, $identity_up_time = null): array
+    public function getContributionSumByLevel(array $initialUserIds, int $maxDepth = 0, $is_old = 0, $startTime = null, $endTime = null): array
     {
         $levelContributions = []; // 结果数组 [level => total_contribution]
         if (empty($initialUserIds)) {
@@ -3481,57 +3437,52 @@ class UserRepository extends BaseRepository
                 break;
             }
 
-            $subordinatesOfCurrentLevelUidList =[];
-            foreach ($subordinatesOfCurrentLevel as &$value){
-                $subordinatesOfCurrentLevelUidList[$value['uid']] = 0;
-                $value['contribute'] = 0;
-            }
-
-            // 如果 传入 $identity_up_time 不为空 证明当前在 确定身份的 用户已经是 业务员了
-            if (!empty($identity_up_time)) {
-                // 用户有贡献值记录，我们要根据 用户的身份 从普通消费者 升级 成业务员 的时间来 查询时间范围内产生的贡献值
-                $userSignGongxianList = Db::name('user_sign_gongxian')
-                    ->whereIn('uid', array_keys($subordinatesOfCurrentLevelUidList))
-                    ->where('addtime', '>=', strtotime($identity_up_time)) //   `addtime` int(10) NOT NULL COMMENT '添加时间'
-                    ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
-                    ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
-                    ->field('uid, number, type') // 只需要下级的uid和贡献值
-                    ->select()
-                    ->toArray();
-                foreach ($userSignGongxianList as $value) {
-                    if($value['type'] == 1) {
-                        $subordinatesOfCurrentLevelUidList[$value['uid']] += $value['number'];
-                    } else {
-                        $subordinatesOfCurrentLevelUidList[$value['uid']] -= $value['number'];
-                    }
-                }
-
-                if ($is_old == 1) {
-                    // 如果是老用户，除了通过贡献值记录表  还要计算 老订单 产生的贡献值
-                    $oldUserOfGoodsList = Db::name('old_user_of_goods')
-                        ->whereIn('user_id', array_keys($subordinatesOfCurrentLevelUidList))
-                        ->where('create_time', '>=', strtotime($identity_up_time)) //   `addtime` int(10) NOT NULL COMMENT '添加时间'
-                        ->where('status', 1) // '是否完成 0, 未完成 1 已完成',
-                        ->field('user_id, money, status, create_time') // 只需要下级的uid和贡献值
-                        ->select()
-                        ->toArray();
-
-                    foreach ($oldUserOfGoodsList as $storeProductData) {
-                        if ($storeProductData['money'] == 1180) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 700;
-                        } else if ($storeProductData['money'] == 10620) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 6300;
-                        } else if ($storeProductData['money'] == 11800) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 7000;
-                        } else if ($storeProductData['money'] == 9440) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 5600;
-                        } else if ($storeProductData['money'] == 2360) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 1400;
-                        } else {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += bcmul($storeProductData['money'], 0.7, 2);
-                        }
-                    }
-                }
+            // 如果 传入 $startTime 不为空 证明当前在 确定身份的 用户已经是 业务员了
+            if (!empty($startTime)) {
+                $subordinatesOfCurrentLevelUidList = $this->getUserContributeByUidList(array_column($subordinatesOfCurrentLevel, 'uid'), $startTime, $endTime);
+                // // 用户有贡献值记录，我们要根据 用户的身份 从普通消费者 升级 成业务员 的时间来 查询时间范围内产生的贡献值
+                // $userSignGongxianList = Db::name('user_sign_gongxian')
+                //     ->whereIn('uid', array_keys($subordinatesOfCurrentLevelUidList))
+                //     ->where('addtime', '>=', strtotime($startTime)) //   `addtime` int(10) NOT NULL COMMENT '添加时间'
+                //     ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
+                //     ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
+                //     ->field('uid, number, type') // 只需要下级的uid和贡献值
+                //     ->select()
+                //     ->toArray();
+                // foreach ($userSignGongxianList as $value) {
+                //     if($value['type'] == 1) {
+                //         $subordinatesOfCurrentLevelUidList[$value['uid']] += $value['number'];
+                //     } else {
+                //         $subordinatesOfCurrentLevelUidList[$value['uid']] -= $value['number'];
+                //     }
+                // }
+                //
+                // if ($is_old == 1) {
+                //     // 如果是老用户，除了通过贡献值记录表  还要计算 老订单 产生的贡献值
+                //     $oldUserOfGoodsList = Db::name('old_user_of_goods')
+                //         ->whereIn('user_id', array_keys($subordinatesOfCurrentLevelUidList))
+                //         ->where('create_time', '>=', strtotime($startTime)) //   `addtime` int(10) NOT NULL COMMENT '添加时间'
+                //         ->where('status', 1) // '是否完成 0, 未完成 1 已完成',
+                //         ->field('user_id, money, status, create_time') // 只需要下级的uid和贡献值
+                //         ->select()
+                //         ->toArray();
+                //
+                //     foreach ($oldUserOfGoodsList as $storeProductData) {
+                //         if ($storeProductData['money'] == 1180) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 700;
+                //         } else if ($storeProductData['money'] == 10620) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 6300;
+                //         } else if ($storeProductData['money'] == 11800) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 7000;
+                //         } else if ($storeProductData['money'] == 9440) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 5600;
+                //         } else if ($storeProductData['money'] == 2360) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 1400;
+                //         } else {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += bcmul($storeProductData['money'], 0.7, 2);
+                //         }
+                //     }
+                // }
             } else {
                 // 如果传入的 $identity_up_time 为空，说明该用户只是一个普通用户（消费者），没有团队业绩
                 break;
@@ -3582,66 +3533,204 @@ class UserRepository extends BaseRepository
         return $levelContributions;
     }
 
-    public function getUserContributeInfoByDepth($uid, $depth = 10)
-    {
-        // 3、获取个人贡献值
+
+    /**
+     * 获取用户 历史的 个人贡献值记录
+     * @param $uidList
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getUserContributeTimeMapByUidList($uidList) {
+        $userContributeTimeMap = [];
+        $userSignGongxianList = Db::name('user_sign_gongxian')
+            ->whereIn('uid', $uidList)
+            ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
+            ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
+            ->field('uid, number, type, mark, settlement_time') // 只需要下级的uid和贡献值
+            ->select()
+            ->toArray();
+        foreach ($userSignGongxianList as $value) {
+            // 贡献表中 包含多种类型的 贡献值记录，比如 用户消费商家获得赠送贡献值 , 推广获得的贡献值（直推），这些都不能算是 用户的 直接贡献值
+            // 只有 用户取消费 比如：购买 ** 商品、扫码消费获得赠送贡献值 等 才算做个人贡献值
+            if (strpos($value['mark'], "购买") !== false || strpos($value['mark'], "扫码") !== false) {
+                if($value['type'] == 1) {
+                    $type = 1;
+                } else {
+                    $type = 2;
+                }
+                $userContributeTimeMap[$value['uid']][] = [
+                    'type' => $type,
+                    'contribute' => $value['number'],
+                    'settlementTime' => $value['settlement_time']
+                ];
+            }
+        }
+        // 老订单 产生的贡献值 并未在 贡献记录表中
+        $oldUserOfGoodsList = Db::name('old_user_of_goods')
+            ->where('status', 1) // '是否完成 0, 未完成 1 已完成',
+            ->whereIn('user_id', $uidList)
+            ->field('user_id, money, status, create_time') // 只需要下级的uid和贡献值
+            ->select()
+            ->toArray();
+        // 定义一个映射数组，用于存储不同 money 对应的 contribute 值
+        $contributeMapping = [
+            1180 => 700,
+            10620 => 6300,
+            11800 => 7000,
+            9440 => 5600,
+            2360 => 1400,
+        ];
+        // 遍历每个 $storeProductData
+        foreach ($oldUserOfGoodsList as $storeProductData) {
+            // 获取 money 的值
+            $money = $storeProductData['money'];
+            // 检查 money 是否在映射中
+            if (isset($contributeMapping[$money])) {
+                // 如果存在，则使用映射的值
+                $contribute = $contributeMapping[$money];
+            } else {
+                // 否则按默认规则计算
+                $contribute = bcmul($money, 0.7, 2);
+            }
+            // 将数据添加到 $userContributeTimeList
+            $userContributeTimeMap[$storeProductData['user_id']][] = [
+                'type' => 1,
+                'contribute' => $contribute,
+                'settlementTime' => $storeProductData['create_time']
+            ];
+        }
+        foreach ($userContributeTimeMap as $key => &$subArray) {
+            usort($subArray, function ($a, $b) {
+                return strtotime($a['settlementTime']) - strtotime($b['settlementTime']);
+            });
+        }
+        return $userContributeTimeMap;
+    }
+
+    /**
+     * 获取用户升级成业务员的时间
+     * @param $uid
+     * @return mixed|string
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function determineUserUpgradeTime($uid) {
         $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'];
+            $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;
                 }
-                $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'];
+            }
+            // 2、获取用户贡献值 日志记录 对应时间
+            $userContributeTimeMap = $this->getUserContributeTimeMapByUidList([$uid]);
+            if (!empty($userContributeTimeMap[$uid])) {
+                $myArriveNumOwn = 0;
+                $myIdentityUpTime = '';
+                foreach ($userContributeTimeMap[$uid] as $value) {
+                    if ($value['type'] == 1) {
+                        $myArriveNumOwn += $value['contribute'];
+                    } else {
+                        $myArriveNumOwn -= $value['contribute'];
+                    }
+                    if ($myArriveNumOwn >= $upArriveNumOwn) {
+                        $myIdentityUpTime = $value['settlementTime'];
                         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
+                    ]);
+                }
+            }
+        }
+        return [
+            'user_group' => $userData['user_group'],
+            'identity_up_time' => $userData['identity_up_time']
+        ];
+    }
+
+    /**
+     * 获取用户列表中 每个人 的 个人贡献值
+     * @param array $uidList
+     * @param null $startTime
+     * @param null $endTime
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getUserContributeByUidList($uidList = [], $startTime = null, $endTime = null)
+    {
+        $subordinatesOfCurrentLevelUidList = [];
+        foreach ($uidList as $uid) {
+            $subordinatesOfCurrentLevelUidList[$uid] = 0;
+        }
+        $userContributeTimeMap = $this->getUserContributeTimeMapByUidList($uidList);
+        if (!empty($userContributeTimeMap)) {
+            foreach ($userContributeTimeMap as $uid => $contributeInfoList) {
+                foreach ($contributeInfoList as $value) {
+                    // 跳过时间范围外的 贡献值
+                    if (!empty($startTime) && strtotime($value['settlementTime']) < strtotime($startTime)) {
+                        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
-                        ]);
+                    if (!empty($endTime) && strtotime($value['settlementTime']) > strtotime($endTime)) {
+                        break;
+                    }
+                    if ($value['type'] == 1) {
+                        $subordinatesOfCurrentLevelUidList[$uid] += $value['contribute'];
+                    } else {
+                        $subordinatesOfCurrentLevelUidList[$uid] -= $value['contribute'];
                     }
                 }
+
+            }
+        }
+        return $subordinatesOfCurrentLevelUidList;
+    }
+
+    /**
+     * 获取用户 团队贡献值信息
+     * @param $uid
+     * @param int $depth // 最深递归层级
+     * @param array $betweenTime // 贡献值获取范围
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getUserContributeInfoByDepth($uid, $depth = 10, $betweenTime = [])
+    {
+        // 3、获取个人贡献值
+        $userData = $this->dao->get($uid)->toArray();
+        // 这一步骤是为了 确定用户升级时间，因为后边的团队贡献值，需要查询 用户 升级为业务员后 所产生的团队贡献值
+        $determineResult = $this->determineUserUpgradeTime($uid);
+        $userData['user_group'] = $determineResult['user_group'];
+        $userData['identity_up_time'] = $determineResult['identity_up_time']; // 获得的值 有可能是时间 有可能是 null
+
+        $startTime = $userData['identity_up_time'];
+        $endTime = date('Y-m-d H:i:s');
+        if (!empty($betweenTime) && !empty($betweenTime['startTime']) && !empty($betweenTime['endTime'])) {
+            if(empty($startTime) || strtotime($startTime) < strtotime($betweenTime['startTime'])) {
+                $startTime = $betweenTime['startTime'];
+            }
+            if(strtotime($betweenTime['endTime']) < strtotime($endTime)) {
+                $endTime = $betweenTime['endTime'];
             }
         }
 
@@ -3658,15 +3747,20 @@ class UserRepository extends BaseRepository
         $userContributionSumMap = [];
         // 获取用户的直属下级
         $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
+        $uidContributeUidList = array_column($uidContributeList, 'uid');
+        // TODO 身份是用户的 $startTime = null
+        $subordinatesOfCurrentLevelUidList = $this->getUserContributeByUidList($uidContributeUidList, $startTime, $endTime);
+
         foreach ($uidContributeList as $uidContribute) {
             // 获取每个下级（部门）的个人贡献值
             $userContributionSumMap[$uidContribute['uid']] = $this->getContributionSumByLevel(
                 [$uidContribute['uid']],
                 $depth,
                 $userData['is_old'],
-                $userData['identity_up_time'] ?? null
+                $startTime,
+                $endTime
             );
-            $userContributionSumMap[$uidContribute['uid']][0] = $uidContribute['contribute'];
+            $userContributionSumMap[$uidContribute['uid']][0] = $subordinatesOfCurrentLevelUidList[$uidContribute['uid']];
             ksort($userContributionSumMap[$uidContribute['uid']]);
             // 假设 老大的 下级是 张三和李四， 董事（最高级身份）需要循环最深的等级是 3 级    得出来的结果↓  这样是为了计算大小部门
             // $userContributionSumMap[直属下级（部门）张三] =>[0 => 张三个人贡献值, 1 => 张三所有下级用户的个人贡献值, 2 => 张三所有下级用户的下级用户贡献值]
@@ -3677,6 +3771,7 @@ class UserRepository extends BaseRepository
         foreach ($userContributionSumMap as $key => $value) {
             $subordinateContribution[$key] = array_sum($value);
         }
+        $dqYj = 0;
         $arriveNumTeam = 0;
         if (!empty($subordinateContribution)) {
             // 大区业绩
@@ -3687,7 +3782,13 @@ class UserRepository extends BaseRepository
             $arriveNumTeam = bcsub($zYj, $dqYj, 2);
         }
 
-        return ['arriveNumTeam' => $arriveNumTeam, 'contribute' => $userData['contribute'], 'per_contribute' => $userData['per_contribute']];
+        return [
+            'arriveNumTeam' => $arriveNumTeam, // 小部门贡献值和
+            'contribute' => $userData['contribute'], // 个人贡献值
+            'perContribute' => $userData['per_contribute'], // 直推贡献值
+            'largeContribute' => $dqYj, // 大部门贡献值
+            'subordinate' => $subordinateContribution // 各部门贡献值和
+        ];
 
     }
 }