修复脚本中的问题

app/controller/api/store/merchant/Taskorderguquan.php

@@ -31,8 +31,6 @@ class Taskorderguquan
             'insertPvSummary' => ['success' => 0, 'failed' => 0],         // 优化: 汇总PV插入结果
             'errors' => [],               // 优化: 统一记录错误信息
         ];
-        $currentTime = time();
-        $currentDateTime = date('Y-m-d H:i:s', $currentTime);
 
         // --- 数据库查询部分 (保持不变，已优化) ---
         // 1. 查询用户
@@ -61,27 +59,29 @@ class Taskorderguquan
 
         // 4. 查询已存在的贡献值记录
         $gongXianListRaw = Db::name("user_sign_gongxian")
+            ->where('status', '!=', -1)
             // 优化: 如果记录非常多，可以分批查询或只查相关用户的
             // ->whereIn('uid', array_merge($userIds, array_column($userList, 'spread_uid'))) // 查询购买者和潜在推广者
-            ->field('uid, order_id, number')
+            ->field('uid, order_id, number, status')
             ->select()
             ->toArray();
 
         // 5. 查询已存在的PV记录
         $pvListRaw = Db::name("user_pv_log")
+            ->where('status', '!=', -1)
             // 优化: 同上
             // ->whereIn('uid', $userIds)
-            ->field('uid, order_id, pv')
+            ->field('uid, order_id, pv, status')
             ->select()
             ->toArray();
 
         // --- 数据预处理部分
         $existingGongXian = [];
-        foreach ($gongXianListRaw as $gx) $existingGongXian[$gx['uid'] . '_' . $gx['order_id']] = $gx['number'];
+        foreach ($gongXianListRaw as $gx) $existingGongXian[$gx['uid'] . '_' . $gx['order_id']] = ['number' => $gx['number'], 'status' => $gx['status']];
         unset($gongXianListRaw);
 
         $existingPv = [];
-        foreach ($pvListRaw as $pv) $existingPv[$pv['uid'] . '_' . $pv['order_id']] = $pv['pv'];
+        foreach ($pvListRaw as $pv) $existingPv[$pv['uid'] . '_' . $pv['order_id']] = ['pv' => $pv['pv'], 'status' => $pv['status']];
         unset($pvListRaw);
 
         $userOfGoodsByUid = [];
@@ -155,24 +155,28 @@ class Taskorderguquan
                             break;
                     }
 
+                    $settlementTimeOld = $oldOrder['create_time'] ? date('Y-m-d H:i:s', $oldOrder['create_time']) : strtotime($user['create_time']);
                     // --- 收集贡献值插入数据 ---
                     $orderKey = $uid . '_' . $oldOrder['order_id'];
                     if (isset($existingGongXian[$orderKey])) {
                         $result['oldOrderExistGongXian'][] = ['uid' => $uid, 'order_id' => $oldOrder['order_id']];
-                        $userUpdateData[$uid]['contribute'] += $existingGongXian[$orderKey];
+                        if ($existingGongXian[$orderKey]['status'] == 1) {
+                            $userUpdateData[$uid]['contribute'] += $existingGongXian[$orderKey]['number'];
+                        }
                         if (!empty($spreadUid) && isset($userUpdateData[$spreadUid])) {
                             if (isset($existingGongXian[$spreadUid . '_' . $oldOrder['order_id']])) {
-                                $userUpdateData[$spreadUid]['per_contribute'] += $existingGongXian[$spreadUid . '_' . $oldOrder['order_id']];
+                                if ($existingGongXian[$spreadUid . '_' . $oldOrder['order_id']]['status'] == 1) {
+                                    $userUpdateData[$spreadUid]['per_contribute'] += $existingGongXian[$spreadUid . '_' . $oldOrder['order_id']]['number'];
+                                }
                             }
                         }
                     } else {
                         if ($totalPv > 0) {
                             $userUpdateData[$uid]['contribute'] += $totalPv;
 
-                            $settlementTimeOld = $oldOrder['create_time'] ? date('Y-m-d H:i:s', $oldOrder['create_time']) : $currentDateTime;
                             // --- 收集贡献值插入数据 ---
                             $gongXianBase = [
-                                "number" => $totalPv, "addtime" => $currentTime, "status" => 1,
+                                "number" => $totalPv, "addtime" => strtotime($settlementTimeOld), "status" => 1,
                                 "order_type" => 1, "order_id" => $oldOrder['order_id'],
                                 "desc" => '', "surplus" => 0, "type" => 1, 'settlement_time' => $settlementTimeOld
                             ];
@@ -190,12 +194,13 @@ class Taskorderguquan
                     // --- 收集 PV 插入数据 ---
                     if (isset($existingPv[$orderKey])) {
                         $result['oldOrderExistPv'][] = ['uid' => $uid, 'order_id' => $oldOrder['order_id']];
-                        $userUpdateData[$uid]['pv'] += $existingGongXian[$orderKey];
-
+                        if ($existingPv[$orderKey]['status'] == 1) {
+                            $userUpdateData[$uid]['pv'] += $existingPv[$orderKey]['pv'];
+                        }
                     } else {
                         $userUpdateData[$uid]['pv'] += $totalPv;
                         $pvDataToInsert[] = [
-                            "uid" => $uid, "pv" => $totalPv, "addtime" => $currentTime, "status" => 1,
+                            "uid" => $uid, "pv" => $totalPv, "addtime" => strtotime($settlementTimeOld), "status" => 1,
                             "order_type" => 0, "order_id" => $oldOrder['order_id'],
                             "mark" => "1.0系统购买会员专区商品赠送PV", 'settlement_time' => $settlementTimeOld
                         ];
@@ -235,15 +240,19 @@ class Taskorderguquan
                     }
                     // --- 收集贡献值插入数据 ---
                     $orderKey = $uid . '_' . $order['order_id'];
-                    $settlementTimeNew = $order['create_time'] ?: $currentDateTime;
+                    $settlementTimeNew = $order['create_time'] ?: date('Y-m-d H:i:s', $user['create_time']);
                     // --- 收集贡献值插入数据 ---
                     if (isset($existingGongXian[$orderKey])) {
                         $result['orderExistGongXian'][] = ['uid' => $uid, 'order_id' => $order['order_id']];
                         // 累加计算值
-                        $userUpdateData[$uid]['contribute'] += $existingGongXian[$orderKey];
+                        if ($existingGongXian[$orderKey]['status'] == 1) {
+                            $userUpdateData[$uid]['contribute'] += $existingGongXian[$orderKey]['member'];
+                        }
                         if (!empty($spreadUid) && isset($userUpdateData[$spreadUid])) {
                             if (isset($existingGongXian[$spreadUid . '_' . $order['order_id']])) {
-                                $userUpdateData[$spreadUid]['per_contribute'] += $existingGongXian[$spreadUid . '_' . $order['order_id']];
+                                if ($existingGongXian[$spreadUid . '_' . $order['order_id']]['status'] == 1) {
+                                    $userUpdateData[$spreadUid]['per_contribute'] += $existingGongXian[$spreadUid . '_' . $order['order_id']]['member'];
+                                }
                             }
                         }
 
@@ -252,7 +261,7 @@ class Taskorderguquan
                             // 累加计算值
                             $userUpdateData[$uid]['contribute'] += $totalPv;
                             $gongXianBase = [ // 优化: 提取公共字段
-                                "number" => $totalPv, "addtime" => $currentTime, "status" => 1,
+                                "number" => $totalPv, "addtime" => strtotime($settlementTimeNew), "status" => 1,
                                 "order_type" => 1, "order_id" => $order['order_id'],
                                 "desc" => '', "surplus" => 0, "type" => 1, 'settlement_time' => $settlementTimeNew
                             ];
@@ -272,11 +281,13 @@ class Taskorderguquan
                     // --- 收集 PV 插入数据 ---
                     if (isset($existingPv[$orderKey])) {
                         $result['orderExistPv'][] = ['uid' => $uid, 'order_id' => $order['order_id']];
-                        $userUpdateData[$uid]['pv'] += $existingPv[$orderKey];
+                        if ($existingPv[$orderKey]['status'] == 1) {
+                            $userUpdateData[$uid]['pv'] += $existingPv[$orderKey]['pv'];
+                        }
                     } else {
                         $userUpdateData[$uid]['pv'] += $totalPv;
                         $pvDataToInsert[] = [
-                            "uid" => $uid, "pv" => $totalPv, "addtime" => $currentTime, "status" => 1,
+                            "uid" => $uid, "pv" => $totalPv, "addtime" => strtotime($settlementTimeNew), "status" => 1,
                             "order_type" => 0, // 确认 PV log 的 order_type 是否与贡献一致或有区分
                             "order_id" => $order['order_id'],
                             "mark" => "2.0系统购买商品赠送PV", // 标记调整为更通用