From 522af410cd44d211f758d3c0a512b18170d1dc61 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 30 Jul 2024 14:27:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AD=89=E7=BA=A7=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PayNotifyLogic.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 098835c7..c3863f04 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -564,6 +564,7 @@ class PayNotifyLogic extends BaseLogic
         $village_uid = 0;
         $brigade_uid = 0;
         $user_ship = 0;
+        $spread_user_ship = 0;
         $order['dealVipAmount'] = 0;
         try {
             Redis::send('order_wetcha_push_send', ['order' => $order]);
@@ -597,8 +598,8 @@ class PayNotifyLogic extends BaseLogic
         //     $order['dealVipAmount']= self::dealVipAmount($order,  $order['pay_type']);
         // }
         if ($order['spread_uid'] > 0 && $user_ship == 0) {
-            $user_ship = User::where('id', $order['spread_uid'])->value('user_ship');
-            if ($user_ship == 2) {
+            $spread_user_ship = User::where('id', $order['spread_uid'])->value('user_ship');
+            if ($spread_user_ship == 2) {
                 $village_uid = $order['spread_uid'];
                 $address = UserAddress::where(['uid' => $order['spread_uid'], 'is_default' => 1])->find();
                 if ($address) {
@@ -607,7 +608,7 @@ class PayNotifyLogic extends BaseLogic
                         $brigade_uid = User::where('id', 'in', $arr2)->where('user_ship', 3)->value('id') ?? 0;
                     }
                 }
-            } elseif ($user_ship == 3) {
+            } elseif ($spread_user_ship == 3) {
                 $brigade_uid = $order['spread_uid'];
                 $address = UserAddress::where(['uid' => $order['spread_uid'], 'is_default' => 1])->find();
                 if ($address) {
@@ -646,7 +647,7 @@ class PayNotifyLogic extends BaseLogic
         $info = StoreOrderCartInfo::where('oid', $order['id'])->field('store_id,product_id,cart_num')->select();
         $comm = new CommissionProductLogic();
         foreach ($info as $v) {
-            $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid,$user_ship);
+            $comm->calculate_product_flow($v, $order, $village_uid, $brigade_uid,$user_ship,$spread_user_ship);
         }
         CommissionLogic::setStore($order,$village_uid, $brigade_uid, $transaction_id);
         return true;