From 614c34db8ea384422b487fad7b57f0edb3a51925 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 27 Jun 2024 19:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php  | 14 ++++++--------
 app/common/logic/PayNotifyLogic.php |  4 +++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 347b25849..b694a0c78 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -478,19 +478,18 @@ class OrderLogic extends BaseLogic
                         'title' => '返还兑换券',
                         'financial_pm' => 1,
                         'store_id' => $order['store_id'],
+                        'status' => 1,
                     ];
                     $sing['number'] = $check['number'];
                     $user_sing->save($sing);
                     //减少
-                    UserSign::where('id',$check['id'])->update(
+                    UserSign::where('id',$check['sid'])->update(
                         [
                             'number'=>$check['number']
                         ]);
                     if($base['number'] == $check['number']){
                         UserSign::where([
-                            'uid'=>$order['uid'],
-                            'type'=>1,
-                            'status'=>0
+                            'id'=>$order['sid']
                         ])->update(['status'=>1]);
                     }
                 }
@@ -501,19 +500,18 @@ class OrderLogic extends BaseLogic
                         'title' => '返还兑换券',
                         'financial_pm' => 1,
                         'store_id' => $base['number'],
+                        'status' => 1,
                     ];
                     $sing['number'] = $check['number'];
                     $user_sing->save($sing);
 
-                    UserSign::where('id',$check['id'])->update(
+                    UserSign::where('id',$check['sid'])->update(
                         [
                             'number'=>$base['number']
                         ]);
 
                     UserSign::where([
-                        'uid'=>$order['uid'],
-                        'type'=>1,
-                        'status'=>0
+                        'id'=>$order['sid']
                     ])->update(['status'=>1]);
                 }
 
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index f02c22d70..e746a956b 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -251,6 +251,7 @@ class PayNotifyLogic extends BaseLogic
                         'status'=>0
                     ])->find();
                     $data = [
+                        'sid'=>$one['id'],
                         'uid' => $order['uid'],
                         'order_id' => $order['order_id'],
                         'title' => '充值获得冻结兑换券',
@@ -323,10 +324,11 @@ class PayNotifyLogic extends BaseLogic
                                 'type' => 1,
                             ];
                             $data['number'] =$check;
-                            Db::name('user_sign')->insert($data);
+                           $sid =  Db::name('user_sign')->insertGetId($data);
 
                             $data = [
                                 'uid' => $order['uid'],
+                                'sid' => $sid,
                                 'order_id' => $order['order_id'],
                                 'title' => '充值获得冻结兑换券',
                                 'financial_pm' => 1,