From 30563323a53b0d0260c97d08a9e8bd4cc8227a95 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Sat, 13 Dec 2025 18:03:52 +0800
Subject: [PATCH] 完成级差奖 完成平级奖

---
 admin/app/shop/model/plus/shareholder/User.php |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin/app/shop/model/plus/shareholder/User.php b/admin/app/shop/model/plus/shareholder/User.php
index 4248c2d..218ed95 100644
--- a/admin/app/shop/model/plus/shareholder/User.php
+++ b/admin/app/shop/model/plus/shareholder/User.php
@@ -13,6 +13,11 @@
  */
 class User extends UserModel
 {
+    public static function checkExistByGradeId($grade_id)
+    {
+        self::where('grade_id',$grade_id)->find();
+    }
+
     /**
      * 获取股东用户列表
      */
@@ -57,18 +62,17 @@
         // 先获取所有股东
         $model = new static;
         $shareholders = $model->where('is_delete', '=', 0)->with(['grade'])->select();
-        
         // 如果没有设置分红条件,返回所有股东
         if (empty($setting['consumption_amount']) && empty($setting['condition_purchase_count'])) {
             return $shareholders;
         }
-        
+
         // 过滤满足条件的股东
         $eligibleShareholders = [];
         foreach ($shareholders as $shareholder) {
             $userId = $shareholder['user_id'];
             $isEligible = true;
-            
+
             // 检查消费金额条件
             if (!empty($setting['consumption_amount'])) {
                 $totalConsumption = (new OrderModel)->getUserTotalConsumption($userId,$bonusData);
@@ -79,7 +83,7 @@
             
             // 检查购买次数条件
             if (!empty($setting['condition_purchase_count']) && $isEligible) {
-                $purchaseCount = (new OrderProductModel)::getPurchaseCount($userId,$bonusData,$shareholder['product_ids']);
+                $purchaseCount = (new OrderProductModel)::getPurchaseCount($userId,$bonusData);
                 if ($purchaseCount < $setting['condition_purchase_count']) {
                     $isEligible = false;
                 }

--
Gitblit v1.9.2