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/VipUserGrade.php | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/admin/app/job/event/VipUserGrade.php b/admin/app/job/event/VipUserGrade.php
index 8bf3775..17d9511 100644
--- a/admin/app/job/event/VipUserGrade.php
+++ b/admin/app/job/event/VipUserGrade.php
@@ -4,9 +4,10 @@
use app\common\model\plus\vip\Grade as GradeModel;
use app\common\model\plus\vip\User as vipUserModel;
-use app\common\model\plus\vip\Order as OrderModel;
+use app\common\model\plus\vip\Order as vipOrderModel;
use app\common\model\supplier\Supplier;
use app\job\model\user\User as UserModel;
+use app\common\model\order\Order as OrderModel;
/**
* VIP用户等级事件管理
*/
@@ -33,6 +34,9 @@
log_write('VIP用户升级$user_id='.$userId);
// 用户模型
$user = vipUserModel::detail($userId);
+ if (empty($user)) {
+ return false;
+ }
// 获取所有等级
$list = GradeModel::getUsableList($user['app_id']);
if ($list->isEmpty()) {
@@ -97,13 +101,23 @@
}
}
+ $buy_product = false;
+ if ($grade['open_buy_product'] == 1&& OrderModel::getOrderProductIds($user['user_id'],$grade['product_ids'],true)){
+ $buy_product= true;
+ }
if($grade['condition_type'] == 'and'){
$grade['is_purchase_count']!=1 && $purchase_count=true;
$grade['is_supplier_count']!=1 && $supplier_count=true;
$grade['is_referee_grade']!=1 && $referee_grade_count=true;
- return $purchase_count && $supplier_count && $referee_grade_count;
+ $grade['is_buy_product']!=1 && $buy_product=true;
+ if ($grade['open_type_product']){
+ return ($purchase_count && $supplier_count && $referee_grade_count) || $buy_product;
+ }else{
+ return $purchase_count && $supplier_count && $referee_grade_count && $buy_product;
+ }
+
}else{
- return $purchase_count || $supplier_count || $referee_grade_count;
+ return $purchase_count || $supplier_count || $referee_grade_count || $buy_product;
}
}
--
Gitblit v1.9.2