From 27f370cd913cb0362da46cffaa10097ffac35fb3 Mon Sep 17 00:00:00 2001
From: liqianjin <949671634@qq.com>
Date: Tue, 1 Apr 2025 10:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=81=E5=B7=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/addon/fenxiao/model/FenxiaoOrder.php b/addon/fenxiao/model/FenxiaoOrder.php
index eb7fce0..7d99a30 100644
--- a/addon/fenxiao/model/FenxiaoOrder.php
+++ b/addon/fenxiao/model/FenxiaoOrder.php
@@ -409,11 +409,11 @@ class FenxiaoOrder extends BaseModel
                         $commission = $goods_config['direct_money'] * $v[ 'num' ];
                     }
                     $commission = $commission - $last_commission;
-
                 }
                 if($commission > 0){
                     $level_num = $user['level_num'];
-                    $last_commission = $commission;
+                    //平级奖不需要扣除上个用户获取的金额,非平级奖则有极差
+                    $last_commission = $is_sideways == 1 ? $last_commission : $commission + $last_commission;
                     $order_fenxiao_data['sideways_fenxiao_id'][] = $user['fenxiao_id'];
                     $order_fenxiao_data['commission'] += $order_fenxiao_data[ 'sideways_commission' ] += $commission;
                     $order_fenxiao_data['sideways_fenxiao_detail'][] = ['name' => $user['fenxiao_name'], 'commission' => $commission,'is_sideways' => $is_sideways];
@@ -490,9 +490,11 @@ class FenxiaoOrder extends BaseModel
                 } else {
                     $commission = $goods_config['direct_money'] * $v[ 'num' ];
                 }
+
                 $commission = $commission - $money;
             }
         }
+
         return $commission > 0 ? $commission : 0;
 
     }
diff --git a/app/pay/controller/Test.php b/app/pay/controller/Test.php
index 5a6d698..d88e1d7 100644
--- a/app/pay/controller/Test.php
+++ b/app/pay/controller/Test.php
@@ -24,7 +24,7 @@ class Test{
 
 //
     public function test(){
-        $orderId = 111;
+        $orderId = 112;
         $order_info = model('order')->getInfo(['order_id' => $orderId]);
          // $fenxiao_order = new OrderPay();
         // $res = $fenxiao_order->handle($order_info);