From 2619e3cdc612c9c977c1fdc90f5fe65beb98aa01 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 27 Jun 2024 21:21:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/UserLogic.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index dd77934bc..e925a859f 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -115,7 +115,8 @@ class UserLogic extends BaseLogic
             $data['openid'] = UserAuth::where(['user_id'=>$uid,'terminal'=>1])->value('openid');
             $number=UserSign::where('uid',$uid)->where('status',0)->sum('number');
             $data['integral']=bcadd($data['integral'],$number,2);
-            $number = UserSign::where('uid',$uid)->where('status',0)->sum('number');
+
+            $number = UserSign::where('uid',$uid)->where(['status'=>0,'financial_pm'=>1])->sum('number');
             $GetNumber = UserSign::where('uid',$uid)->where('status',1)->sum('number');
             $data['number'] =bcadd($number,0,2);
             $data['GetNumber'] =bcadd($GetNumber,0,2);

From 093e03205c13f18a29395c500b876628fcb1b95c Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 27 Jun 2024 21:27:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PayNotifyLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 86ea0a28e..4db11d06b 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -664,7 +664,7 @@ class PayNotifyLogic extends BaseLogic
             $uid=$order['other_uid'];
         }
         $check  = UserSign::where(['uid'=>$order->uid,'type'=>1])->count();
-        if(empty($check)){
+        if(empty($check) && $user['user_ship'] == 0){
             self::dealRechargeFrozen($order);
 
         }

From 4f7fea827397084d636b17a72d1fbe77f1017f11 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 27 Jun 2024 21:29:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?gengxin=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F?=
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 4db11d06b..5a27e10e2 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -654,6 +654,11 @@ class PayNotifyLogic extends BaseLogic
         }
         bcscale(2);
         //        $user->now_money = bcadd($user->now_money, $price, 2);//v.1
+        $check  = UserSign::where(['uid'=>$order->uid,'type'=>1])->count();
+        if(empty($check) && $user['user_ship'] == 0){
+            self::dealRechargeFrozen($order);
+
+        }
         //更新等级
         $user->user_ship = $order['user_ship'];
     
@@ -663,11 +668,7 @@ class PayNotifyLogic extends BaseLogic
         if($order['other_uid']>0){
             $uid=$order['other_uid'];
         }
-        $check  = UserSign::where(['uid'=>$order->uid,'type'=>1])->count();
-        if(empty($check) && $user['user_ship'] == 0){
-            self::dealRechargeFrozen($order);
 
-        }
 
         PushService::push('wechat_mmp_' . $uid, $uid, ['type'=>'INDUSTRYMEMBERS','msg'=>'订单支付成功','data'=>['id'=>$order['id'],'paid'=>1]]);
         PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type'=>'INDUSTRYMEMBERS','msg'=>'订单支付成功','data'=>['id'=>$order['id'],'paid'=>1]]);