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/common/model/plus/bonus/Order.php |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/admin/app/common/model/plus/bonus/Order.php b/admin/app/common/model/plus/bonus/Order.php
index 2e3a605..5af96d9 100644
--- a/admin/app/common/model/plus/bonus/Order.php
+++ b/admin/app/common/model/plus/bonus/Order.php
@@ -5,7 +5,6 @@
 use app\common\model\BaseModel;
 use app\common\enum\order\OrderTypeEnum;
 use app\common\model\plus\bonus\User as UserModel;
-
 /**
  * 队长订单模型
  */
@@ -191,7 +190,7 @@
 
     public static function getUserOrderCount($user_id)
     {
-        return (new static())->where('second_user_id', '=', $user_id)
+        return (new static())->where(['second_user_id'=>$user_id,'is_invalid'=>0])
             ->count();
     }
 
@@ -208,15 +207,15 @@
         if (!$setting['is_open']) {
             return false;
         }
-        $purchase_count=self::getUserOrderCount($order['user_id']);
-        $user=User::detail($order['user_id']);
-        if ($user['purchase_count']<=$purchase_count&&$user['purchase_count']!=11){
-            return false;
-        }
         // 获取当前买家的直推奖用户id和业绩奖用户id
         $agentUser = $model->getAgentUserId($order, $setting['begin_num']);
         // 无分红用户
         if (!$agentUser['first_user_id'] && !$agentUser['second_user_id']) {
+            return false;
+        }
+        $purchase_count=self::getUserOrderCount($order['user_id']);
+        $user=User::detail($order['user_id']);
+        if ($user['purchase_count']<=$purchase_count&&$user['purchase_count']!=11){
             return false;
         }
         // 检查商品是否设置独立分红
@@ -237,8 +236,8 @@
             'order_id' => $order['order_id'],
             'order_type' => $order_type,
             'order_price' => bcsub($order['pay_price'], $order['express_price'], 2),
-            'first_money' => $agentUser['first_user_id'] > 0 ? $one_money : 0,
-            'second_money' => $agentUser['second_user_id'] > 0 ? $two_money : 0,
+            'first_money' =>  $one_money,
+            'second_money' =>  $two_money,
             'first_user_id' => $one_money > 0 ?$agentUser['first_user_id']:0,
             'second_user_id' => $agentUser['second_user_id'],
             'subsidy_user_id'=>$agentUser['subsidy_user_id'],

--
Gitblit v1.9.2