From 5a0c64bac095ed66243ee0f35d9529928923c048 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Wed, 25 Nov 2020 12:03:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=94=A8=E6=88=B7=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E7=BB=9F=E8=AE=A1=E2=80=94=E2=80=94=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/auto_set_follow_status_script.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/script/auto_set_follow_status_script.php b/script/auto_set_follow_status_script.php
index 67e0a93..8e56692 100644
--- a/script/auto_set_follow_status_script.php
+++ b/script/auto_set_follow_status_script.php
@@ -7,6 +7,7 @@ use app\manager\model\FollowRecord;
 use app\manager\model\ProductOrder;
 use app\manager\model\User;
 use enum\user\User as UserEnum;
+use enum\order\ProductOrder as ProductOrderEnum;
 
 $user_model = new User;
 $product_order_model = new ProductOrder;
@@ -90,15 +91,18 @@ foreach ($over_15_list as $info) {
 }
 
 $user_model->updateOne(['Id' => ['in', $cost_user_id_list]], ['follow_status' => $user_enum::$Finish]);
-$user_model->updateOne(['Id' => ['in', $uncost_user_id_list]], ['follow_status' => $user_enum::$UnfollowBuyReduce]);
+$user_model->updateOne(['Id' => ['in', $uncost_user_27953id_list]], ['follow_status' => $user_enum::$UnfollowBuyReduce]);
 $user_model->updateOne(['Id' => ['in', $uncost_overtime_user_id_list]], ['follow_status' => $user_enum::$FollowOverTimeNotBuy]);
 $user_model->updateOne(['Id' => ['in', $cost_overtime_user_id_list]], ['follow_status' => $user_enum::$FollowOverTimeBuyReduce]);
 
 //更新用户最后的支付时间
-$all_user_list = $user_model->getList([], 'Id');
-$all_user_id_list = [];
+$all_user_list = $user_model->getList([], 'Id,pay_time');
 foreach ($all_user_list as $user) {
     $pay_time = $product_order_model->getNewOne('UpdateTime', ['UserId' => $user['Id'], 'OrderState' => ['in', ProductOrderEnum::$PayComplete]]);
-    $user_model->updateOne(['Id'=>$user['Id']],['pay_time'=>$pay_time['UpdateTime']]);
+    if(!empty($pay_time['UpdateTime'])){
+        if($user['pay_time'] != $pay_time['UpdateTime']){
+            $user_model->updateOne(['Id'=>$user['Id']],['pay_time'=>$pay_time['UpdateTime']]);
+        }
+    }
 }