From db042696ffc47ca0c6ba3d236bb797b284508d8d Mon Sep 17 00:00:00 2001
From: liqianjin <949671634@qq.com>
Date: Mon, 31 Mar 2025 15:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=94=80=E8=87=AA?=
 =?UTF-8?q?=E8=B4=AD=E7=9B=B4=E6=8E=A8=E9=97=B4=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addon/fenxiao/model/FenxiaoOrder.php | 12 ++++++++++--
 app/pay/controller/Test.php          |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/addon/fenxiao/model/FenxiaoOrder.php b/addon/fenxiao/model/FenxiaoOrder.php
index f75e9ff..7c85dcc 100644
--- a/addon/fenxiao/model/FenxiaoOrder.php
+++ b/addon/fenxiao/model/FenxiaoOrder.php
@@ -43,6 +43,7 @@ class FenxiaoOrder extends BaseModel
         if (empty($member_info)) return $this->success();
         if ($member_info[ 'fenxiao_id' ] == 0) return $this->success();
         $fenxiao_id = $member_info[ 'fenxiao_id' ];
+
         $field = 'f.fenxiao_id,f.fenxiao_name,f.member_id,f.level_id,f.site_id,f.status,f.parent,f.grand_parent,f.chain,l.level_num,l.one_rate,l.two_rate';
         $join = [
             ['fenxiao_level l', 'f.level_id = l.level_id', 'right']
@@ -50,11 +51,13 @@ class FenxiaoOrder extends BaseModel
         $fenxiao_info = model("fenxiao")->getInfo([ [ 'f.fenxiao_id', '=', $fenxiao_id ], [ 'f.is_delete', '=', 0 ] ],$field,'f',$join);
         if (empty($fenxiao_info)) return $this->success();
         // 如果购买人是分销商 并且未开启分销商自购
+
         if ($member_info[ 'is_fenxiao' ] && $fenxiao_basic_config[ 'self_purchase_rebate' ] == 0) {
             if (empty($fenxiao_info[ 'parent' ])) return $this->success();
             $fenxiao_info = model("fenxiao")->getInfo([ [ 'fenxiao_id', '=', $fenxiao_info[ 'parent' ] ], [ 'is_delete', '=', 0 ] ]);
             if (empty($fenxiao_info)) return $this->success();
         }
+
         // //判断几级分销
         // $parent_fenxiao_info = $level_config >= 2 ? model('fenxiao')->getInfo([ [ 'fenxiao_id', '=', $fenxiao_info[ 'parent' ] ], [ 'is_delete', '=', 0 ] ], 'fenxiao_id, fenxiao_name, status, parent') : [];
         // $grand_parent_fenxiao_info = $level_config >= 3 && !empty($parent_fenxiao_info[ 'parent' ]) ? model('fenxiao')->getInfo([ [ 'fenxiao_id', '=', $parent_fenxiao_info[ 'parent' ] ], [ 'is_delete', '=', 0 ] ], 'fenxiao_id, fenxiao_name, status') : [];
@@ -171,8 +174,13 @@ class FenxiaoOrder extends BaseModel
         $join = [
             ['fenxiao_level fl','f.level_id = fl.level_id','right']
         ];
-        $parent_fenxiao_info = $fenxiao_info['parent'] > 0 ? model('fenxiao')->getInfo([ [ 'f.fenxiao_id', '=', $fenxiao_info[ 'parent' ] ], [ 'f.is_delete', '=', 0 ] ], 'f.fenxiao_id, f.fenxiao_name, f.status, f.parent,f.level_id,fl.level_num','f',$join) : [];
-        $g_parent_fenxiao_info = $fenxiao_info['grand_parent'] > 0 ? model('fenxiao')->getInfo([ [ 'f.fenxiao_id', '=', $fenxiao_info[ 'grand_parent' ] ], [ 'f.is_delete', '=', 0 ] ], 'f.fenxiao_id, f.fenxiao_name, f.status, f.parent,f.level_id,fl.level_num','f',$join) : [];
+        if($config['self_purchase_rebate'] > 0){
+            $parent_fenxiao_info = $fenxiao_info;
+            $g_parent_fenxiao_info = $fenxiao_info['parent'] > 0 ? model('fenxiao')->getInfo([ [ 'f.fenxiao_id', '=', $fenxiao_info[ 'parent' ] ], [ 'f.is_delete', '=', 0 ] ], 'f.fenxiao_id, f.fenxiao_name, f.status, f.parent,f.level_id,fl.level_num','f',$join) : [];
+        }else{
+            $parent_fenxiao_info = $fenxiao_info['parent'] > 0 ? model('fenxiao')->getInfo([ [ 'f.fenxiao_id', '=', $fenxiao_info[ 'parent' ] ], [ 'f.is_delete', '=', 0 ] ], 'f.fenxiao_id, f.fenxiao_name, f.status, f.parent,f.level_id,fl.level_num','f',$join) : [];
+            $g_parent_fenxiao_info = $fenxiao_info['grand_parent'] > 0 ? model('fenxiao')->getInfo([ [ 'f.fenxiao_id', '=', $fenxiao_info[ 'grand_parent' ] ], [ 'f.is_delete', '=', 0 ] ], 'f.fenxiao_id, f.fenxiao_name, f.status, f.parent,f.level_id,fl.level_num','f',$join) : [];
+        }
         //直推
         if (!empty($parent_fenxiao_info) && $parent_fenxiao_info[ 'status' ] == 1) {
 
diff --git a/app/pay/controller/Test.php b/app/pay/controller/Test.php
index c086a0d..df9d6b7 100644
--- a/app/pay/controller/Test.php
+++ b/app/pay/controller/Test.php
@@ -24,7 +24,7 @@ class Test{
 
 //
     public function test(){
-        $orderId = 101;
+        $orderId = 104;
         $order_info = model('order')->getInfo(['order_id' => $orderId]);
          // $fenxiao_order = new OrderPay();
         // $res = $fenxiao_order->handle($order_info);