From 210d1a88a9203baa0a4042169c776ed4b433d087 Mon Sep 17 00:00:00 2001
From: wuhui <1760308791@qq.com>
Date: Fri, 8 Dec 2023 22:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E5=8D=87=E7=BA=A7=20=E7=AD=89=E7=BA=A7=E6=9D=83?=
 =?UTF-8?q?=E9=87=8D=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9A=E8=B4=A1=E7=8C=AE=E5=80=BC=E5=88=86=E7=BA=A2?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=B0=E7=BB=8F=E7=BA=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=9C=A8=E6=96=87=E5=88=9B?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/models/Income.php                           |  2 +-
 .../modules/finance/controllers/IncomeController.php   |  2 +-
 plugins/commission/src/Jobs/UpgrateByOrderJob.php      | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/common/models/Income.php b/app/common/models/Income.php
index 9480c212..008c2211 100644
--- a/app/common/models/Income.php
+++ b/app/common/models/Income.php
@@ -323,7 +323,7 @@ class Income extends BaseModel
     public static function getAllIncome($uid,$contentType = 'all'){
         // 这里查询不包括  经销商、分销商、股东分红相关佣金
         $otherTotal = (float)Income::uniacid()
-            ->whereNotIn('dividend_code',[1,2,64])
+            ->whereNotIn('dividend_code',[1,2,64,201])
             ->where('member_id', $uid)
             ->sum('amount');
         // 获取经销商提成 分红类型：0=分红佣金，1=平级奖，2=感恩奖励，3=额外分红，4=生态建设，5=生态贡献(生态建设平级奖)，6=生态服务
diff --git a/app/frontend/modules/finance/controllers/IncomeController.php b/app/frontend/modules/finance/controllers/IncomeController.php
index 01f3c748..231d04d3 100644
--- a/app/frontend/modules/finance/controllers/IncomeController.php
+++ b/app/frontend/modules/finance/controllers/IncomeController.php
@@ -178,7 +178,7 @@ class IncomeController extends ApiController
                         })->orWhere(function($threeQuery){
                             $threeQuery->where('yz_member_income.dividend_code',64)->where('yz_shareholder_dividend.income_type',0);
                         })->orWhere(function($threeQuery){
-                            $threeQuery->whereNotIn('yz_member_income.dividend_code',[1,2,64]);
+                            $threeQuery->whereNotIn('yz_member_income.dividend_code',[1,2,64,201]);
                         });
                     });
                 }
diff --git a/plugins/commission/src/Jobs/UpgrateByOrderJob.php b/plugins/commission/src/Jobs/UpgrateByOrderJob.php
index 8db88f9e..0148ed92 100644
--- a/plugins/commission/src/Jobs/UpgrateByOrderJob.php
+++ b/plugins/commission/src/Jobs/UpgrateByOrderJob.php
@@ -75,12 +75,13 @@ class UpgrateByOrderJob implements ShouldQueue
             } else {
                 // 分销商的等级权重
                 $agent_level_weight = isset($agent->agentLevel->level) ? $agent->agentLevel->level : 0;
+                $culturalLevelWeight = isset($agent->culturalLevel->level) ? $agent->culturalLevel->level : 0;
                 // uid 重新赋值
                 $this->uid = $agent->member_id;
                 \Log::debug('UID['.$this->uid.']要进行升级');
                 // file_put_contents(storage_path('logs/Y0914.txt'),  print_r('time:'.date('Y-m-d H:i:s').',UID['.$this->uid.']要进行升级'.PHP_EOL,1), FILE_APPEND);
                 // 下一步
-                $this->fecLevels($agent_level_weight);
+                $this->fecLevels($agent_level_weight,$culturalLevelWeight);
             }
 
             // 递归当前
@@ -88,15 +89,18 @@ class UpgrateByOrderJob implements ShouldQueue
         }
     }
 
-    private function fecLevels($level_weight)
+    private function fecLevels($level_weight,$culturalLevelWeight)
     {
         \Log::debug('$level_weight',$level_weight);
         $is_upgrate = true;
         foreach ($this->levels as $level) {
             // 当前等级的等级权重 小于等于 分销商等级的等级权重
-            if ($level['level'] <= $level_weight) {
+            if(($level['level_type'] == 0 && $level['level'] <= $level_weight) || ($level['level_type'] == 1 && $level['level'] <= $culturalLevelWeight)){
                 continue;
             }
+            // if ($level['level'] <= $level_weight) {
+            //     continue;
+            // }
             // 判断条件
             $condition = $this->getCondition($level);