From c3d1de36716eb705b2e9c23be04c21f420fcc268 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 29 Jul 2024 16:16:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=AE=A1=E7=AE=97=E4=BA=A7=E5=93=81=E4=BD=A3=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/CommissionProductLogic.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/common/logic/CommissionProductLogic.php b/app/common/logic/CommissionProductLogic.php
index 8066d82ce..0bab05919 100644
--- a/app/common/logic/CommissionProductLogic.php
+++ b/app/common/logic/CommissionProductLogic.php
@@ -7,6 +7,7 @@ use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_finance_flow_product\StoreFinanceFlowProduct;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\store_product\StoreProduct;
+use PDO;
 
 /**
  * 产品佣金计算
@@ -18,22 +19,26 @@ class CommissionProductLogic extends BaseLogic
     /**
      * 根据毛利率计算
      */
-    function calculate_product_flow($find, $order, $village_uid = 0, $brigade_uid = 0, $user_ship = 0)
+    function calculate_product_flow($find, $order, $village_uid = 0, $brigade_uid = 0, $user_ship = 0, $spread_user_ship = 0)
     {
         $product = StoreProduct::where('id', $find['product_id'])->find();
         if ($product && $product['rose'] > 0) {
-            if(in_array($user_ship,[4, 6, 7])){
-                $this->b($find, $order,$product);
+            if (in_array($user_ship, [4, 6, 7])) {
+                $this->b($find, $order, $product);
                 return true;
             }
-            if ($product['rose'] >= 0 && $product['rose'] < 8) {
-                $this->b($find, $order,$product);
-            } elseif ($product['rose'] >= 8) {
+            if ($product['rose'] > 8) {
+                return false;
+            } else {
                 $this->a($find, $order, $village_uid, $brigade_uid, $user_ship, $product);
             }
+            return true;
         }
     }
 
+    /**
+     * 零售价结算
+     */
     public function a($find, $order, $village_uid, $brigade_uid, $user_ship, $product)
     {
         $rose = bcdiv($product['rose'], 100, 2);
@@ -109,6 +114,9 @@ class CommissionProductLogic extends BaseLogic
         (new StoreFinanceFlowProduct())->saveAll($data);
     }
 
+    /**
+     * 商户价结算
+     */
     public function b($find, $order, $product)
     {
         // $rose = bcdiv($product['rose'], 100, 2);