From 36ff55caf17d5d595eeb976c11c352318388725c Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 21 Jun 2024 11:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=93=B6=E5=8F=B0?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=90=8E=E7=9A=84=E8=BF=94=E8=BF=98=E9=87=91?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/UserLogic.php    |  2 +-
 app/common/logic/PayNotifyLogic.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index 277da81b9..740c018f3 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -72,7 +72,7 @@ class UserLogic extends BaseLogic
     {
         $data =  User::with(['userShip'])->where('id',$uid)
             ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship
-            ,purchase_funds,integral')
+            ,purchase_funds,integral,pay_password')
             ->find();
         //判断是不是员工
         if($data){
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 6fa47d13c..c7e0a9580 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -127,9 +127,9 @@ class PayNotifyLogic extends BaseLogic
 
         $capitalFlowDao = new CapitalFlowLogic($user);
         $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'],'',1,$order['store_id']);
-        if ($user['user_ship'] ==  1) {
-            self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS);
-        }
+//        if ($user['user_ship'] ==  1) {
+//            self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS);
+//        }
 
         if($extra && $extra['store_id']){
             $params = [
@@ -140,9 +140,9 @@ class PayNotifyLogic extends BaseLogic
             OrderLogic::writeOff($params);
         }
         self::dealProductLog($order);
-        if($order['shipping_type'] == 3){
-            self::descStock($order['id']);
-        }
+//        if($order['shipping_type'] == 3){
+//            self::descStock($order['id']);
+//        }
 
         // self::afterPay($order);
         // Redis::send('push-platform-print', ['id' => $order['id']], 60);