From 73b874c72ad55eb9eef21c36160ac0de58f0189e Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Thu, 05 Feb 2026 10:30:43 +0800
Subject: [PATCH] 优化名片

---
 admin/app/job/event/AgentUserGrade.php |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/admin/app/job/event/AgentUserGrade.php b/admin/app/job/event/AgentUserGrade.php
index 9b6efc0..85e000b 100644
--- a/admin/app/job/event/AgentUserGrade.php
+++ b/admin/app/job/event/AgentUserGrade.php
@@ -54,6 +54,9 @@
             }
         }
         if($upgradeGrade){
+            if($user['grade_id'] == $upgradeGrade['grade_id']){
+                return true;
+            }
             $this->dologs('setAgentUserGrade', [
                 'user_id' => $user['user_id'],
                 'grade_id' => $upgradeGrade['grade_id'],
@@ -78,10 +81,18 @@
         if($grade['open_agent_user'] == 1 && UserModel::agentCount($user['user_id']) >= $grade['agent_user']){
             $agent_user = true;
         }
+        // 按购买指定商品次数升级
+        $purchase_count = false;
+        if($grade['is_purchase_count'] == 1 && $user['user']['purchase_count'] >= $grade['purchase_count']){
+            $purchase_count = true;
+        }
         if($grade['condition_type'] == 'and'){
-            return $agent_money && $agent_user;
+            $grade['open_agent_user']!=1 && $agent_user=true;
+            $grade['open_agent_money']!=1 && $agent_money=true;
+            $grade['is_purchase_count']!=1 && $purchase_count=true;
+            return $agent_money && $agent_user && $purchase_count;
         }else{
-            return $agent_money || $agent_user;
+            return $agent_money || $agent_user || $purchase_count;
         }
     }
 

--
Gitblit v1.9.2