From 4c43c58f4e0c56f77ad104de3f0d6bf65d0ba9c7 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 10 Jul 2024 10:17:18 +0800
Subject: [PATCH] =?UTF-8?q?refactor(PayNotifyLogic):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=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/api/lists/product/ProductLists.php | 10 ++++++++--
 app/common/logic/PayNotifyLogic.php    |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index 277c2077..13015627 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -81,8 +81,14 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis
         }
         $fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock';
         $off_activity = Config::where('name', 'off_activity')->value('value');
-        if ($this->userId > 0) {
-            $user_ship = User::where('id', $this->userId)->value('user_ship');
+        $uid=0;
+        if($this->request->get('uid',0)>0){
+            $uid=$this->request->get('uid',0);
+        }elseif( $this->userId > 0){
+            $uid=$this->userId;
+        }
+        if ($uid>0) {
+            $user_ship = User::where('id', $uid)->value('user_ship');
             if (in_array($user_ship, [4, 5, 6, 7])) {
                 $off_activity = 1;
             }
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 91a87fc2..0b9131fb 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -603,9 +603,9 @@ class PayNotifyLogic extends BaseLogic
         }
 
         //如果是会员需要返回会员金额
-        if ($user_ship>0 && $order['pay_type'] != PayEnum::CASH_PAY && $off_activity !=1) {
-            $order['dealVipAmount']= self::dealVipAmount($order,  $order['pay_type']);
-        }
+        // if ($user_ship>0 && $order['pay_type'] != PayEnum::CASH_PAY && $off_activity !=1) {
+        //     $order['dealVipAmount']= self::dealVipAmount($order,  $order['pay_type']);
+        // }
         if ($order['spread_uid'] > 0 || $user_ship > 0) {
             if ($order['spread_uid'] > 0 && $user_ship == 0) {
                 $user_ship = User::where('id', $order['spread_uid'])->value('user_ship');