From 63c90c8bbf77d3aa57d1eeb049185fcd7b470211 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 26 Aug 2024 23:09:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(commission):=20=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E6=B6=A6=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E9=AB=98=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PayNotifyLogic.php | 73 +++++++----------------------
 1 file changed, 17 insertions(+), 56 deletions(-)

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 9aac367fd..1bdacd40c 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -677,67 +677,28 @@ class PayNotifyLogic extends BaseLogic
             }
             $info = StoreOrderCartInfo::where('oid', $order['id'])->field('store_id,product_id,cart_num')->select();
             $comm = new CommissionProductLogic();
-            foreach ($info as $k => $v) {
-                $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid, $user_ship);
-            }
-            CommissionnLogic::setStore($order, $village_uid, $brigade_uid, $transaction_id);
-            return true;
-            if (isset($user) && $order['store_id'] == getenv('ACTIVITY_STORE_ID') && !in_array($user['user_ship'], [4, 6, 7])) {
-                try {
-                    $info = StoreOrderCartInfo::where('oid', $order['id'])->field('store_id,product_id,cart_num')->select();
-                    $comm = new CommissionProductLogic();
-                    foreach ($info as $k => $v) {
-                        $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid, $user_ship);
-                    }
-                    CommissionnLogic::setStore($order, $village_uid, $brigade_uid, $transaction_id);
-                    return true;
-                } catch (\Exception $e) {
-                    Log::error('活动分润报错' . $e->getMessage());
-                    return false;
+            try {
+                foreach ($info as $k => $v) {
+                    $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid, $user_ship);
                 }
-            }
-            switch ($user_ship) {
-                case 1: // 厨师
-                    //case 4: // 商户
-                    //case 5: // 种养殖
-                    // case 6: // 酒店
-                    // case 7: // 食堂
-                case 8: // 一条龙
-                    CommissionLogic::setCook($order, $village_uid, $brigade_uid, $transaction_id);
-                    break;
-                case 2: // 村长
-                    CommissionLogic::setVillage($order, $village_uid, $brigade_uid, $transaction_id);
-                    break;
-                case 3: // 队长
-                    CommissionLogic::setBrigade($order, $village_uid, $brigade_uid, $transaction_id);
-                    break;
-                default:
-                    CommissionLogic::setStore($order, $transaction_id);
-                    break;
+                CommissionnLogic::setStore($order, $village_uid, $brigade_uid, $transaction_id);
+            } catch (\Throwable $e) {
+                Log::error('分润报错' . $e->getMessage());
+                return false;
             }
         } else {
-            $info = StoreOrderCartInfo::where('oid', $order['id'])->field('store_id,product_id,cart_num')->select();
-            $comm = new CommissionProductLogic();
-            foreach ($info as $k => $v) {
-                $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid, $user_ship);
-            }
-            CommissionnLogic::setStore($order, $village_uid, $brigade_uid, $transaction_id);
-            return true;
-            if (isset($user) && $order['store_id'] == getenv('ACTIVITY_STORE_ID') && !in_array($user['user_ship'], [4, 6, 7])) {
-                try {
-                    $info = StoreOrderCartInfo::where('oid', $order['id'])->field('store_id,product_id,cart_num')->select();
-                    $comm = new CommissionProductLogic();
-                    foreach ($info as $k => $v) {
-                        $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid, $user_ship);
-                    }
-                    CommissionnLogic::setStore($order, $village_uid, $brigade_uid, $transaction_id);
-                    return true;
-                } catch (\Exception $e) {
-                    Log::error('活动分润报错' . $e->getMessage());
-                    return false;
+            try {
+                $info = StoreOrderCartInfo::where('oid', $order['id'])->field('store_id,product_id,cart_num')->select();
+                $comm = new CommissionProductLogic();
+                foreach ($info as $k => $v) {
+                    $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid, $user_ship);
                 }
+                CommissionnLogic::setStore($order, $village_uid, $brigade_uid, $transaction_id);
+            } catch (\Throwable $e) {
+                Log::error('分润报错' . $e->getMessage());
+                return false;
             }
-            CommissionLogic::setStore($order, $transaction_id);
+            return true;
         }
     }