不在从老订单表中统计贡献值，并将spread_uid替换为level_id

app/common/repositories/user/UserRepository.php

@@ -3365,11 +3365,11 @@ class UserRepository extends BaseRepository
      * @throws DbException
      * @throws ModelNotFoundException
      */
-    public function getUidContributeListBySpreadUidList(array $uidList)
+    public function getUidContributeListByLevelIdList(array $uidList)
     {
         return Db::name("user")
-            ->whereIn("spread_uid", $uidList)
-            ->field("uid, contribute, spread_uid")
+            ->whereIn("level_id", $uidList)
+            ->field("uid, contribute, level_id")
             ->select()
             ->toArray();
     }
@@ -3420,7 +3420,7 @@ class UserRepository extends BaseRepository
             foreach(array_chunk($currentLevelIds, $chunkSize) as $chunk) {
                 $subordinatesChunk = Db::name('user')
                     ->field('uid') // 只需要下级的uid
-                    ->whereIn('spread_uid', $chunk) // spread_uid 在当前层级用户块中
+                    ->whereIn('level_id', $chunk) //level_id 在当前层级用户块中
                     ->where('status', 1)
                     ->select()
                     ->toArray();
@@ -3562,40 +3562,40 @@ class UserRepository extends BaseRepository
                 ];
             }
         }
-        // 老订单 产生的贡献值 并未在 贡献记录表中
-        $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']
-            ];
-        }
+        // // 老订单 产生的贡献值 并未在 贡献记录表中
+        // $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' => date('Y-m-d H:i:s', $storeProductData['create_time'])
+        //     ];
+        // }
         foreach ($userContributeTimeMap as $key => &$subArray) {
             usort($subArray, function ($a, $b) {
                 return strtotime($a['settlementTime']) - strtotime($b['settlementTime']);
@@ -3630,9 +3630,9 @@ class UserRepository extends BaseRepository
             }
             // 2、获取用户贡献值 日志记录 对应时间
             $userContributeTimeMap = $this->getUserContributeTimeMapByUidList([$uid]);
+            $myIdentityUpTime = '';
             if (!empty($userContributeTimeMap[$uid])) {
                 $myArriveNumOwn = 0;
-                $myIdentityUpTime = '';
                 foreach ($userContributeTimeMap[$uid] as $value) {
                     if ($value['type'] == 1) {
                         $myArriveNumOwn += $value['contribute'];
@@ -3644,12 +3644,17 @@ class UserRepository extends BaseRepository
                         break;
                     }
                 }
-                if (!empty($myIdentityUpTime)) {
-                    $data['identity_up_time'] = $userData['identity_up_time'] = $myIdentityUpTime;
-                    // 只升级 不降级
-                    if ($userData['user_group'] == 1) {
-                        $userData['user_group'] = $yeWuYuanId;
-                    }
+            }
+            if (!empty($myIdentityUpTime)) {
+                $data['identity_up_time'] = $userData['identity_up_time'] = $myIdentityUpTime;
+                // 只升级 不降级
+                if ($userData['user_group'] == 1) {
+                    $userData['user_group'] = $yeWuYuanId;
+                }
+                $this->dao->update($uid, $data);
+            } else {
+                if ($userData['is_old'] == 1) {
+                    $data['identity_up_time'] = $userData['identity_up_time'] = $userData['create_time'];
                     $this->dao->update($uid, $data);
                 }
             }
@@ -3720,7 +3725,7 @@ class UserRepository extends BaseRepository
         $userContributionSumMap = [];
         if ($depth >= 0 && !empty($startTime)) {
             // 获取用户的直属下级
-            $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
+            $uidContributeList = $this->getUidContributeListByLevelIdList([$uid]);
             $uidContributeUidList = array_column($uidContributeList, 'uid');
             $subordinatesOfCurrentLevelUidList = $this->getUserContributeByUidList($uidContributeUidList, $startTime, $endTime);