From fb03d9c2ff9d2670c905311b20c14d580416cda4 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 27 Jun 2024 19:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=90=8E=E5=88=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php  | 13 ++++++++-
 app/common/logic/PayNotifyLogic.php | 44 ++++++++++++++---------------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index f30d16240..347b25849 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -460,7 +460,7 @@ class OrderLogic extends BaseLogic
 
             $check = Db::name('user_sign_log')->where('order_id',$order['order_id'])
                 ->where(['status'=>0])
-                ->find();
+                ->find();//$check['number']扣的
             if($check){
 //                User::where('id',$order['uid'])->inc('purchase_funds',$check['number'])->update();
 //                $user_number = bcmul($order['pay_price'], '0.10', 2);
@@ -481,6 +481,11 @@ class OrderLogic extends BaseLogic
                     ];
                     $sing['number'] = $check['number'];
                     $user_sing->save($sing);
+                    //减少
+                    UserSign::where('id',$check['id'])->update(
+                        [
+                            'number'=>$check['number']
+                        ]);
                     if($base['number'] == $check['number']){
                         UserSign::where([
                             'uid'=>$order['uid'],
@@ -499,6 +504,12 @@ class OrderLogic extends BaseLogic
                     ];
                     $sing['number'] = $check['number'];
                     $user_sing->save($sing);
+
+                    UserSign::where('id',$check['id'])->update(
+                        [
+                            'number'=>$base['number']
+                        ]);
+
                     UserSign::where([
                         'uid'=>$order['uid'],
                         'type'=>1,
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 373aa64c0..f02c22d70 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -259,26 +259,26 @@ class PayNotifyLogic extends BaseLogic
                     ];
 
                     if($one['back_num'] >= $backPurchase){
-                        $wait = bcsub($one['back_num'],$backPurchase,2)??0;
+//                        $wait = bcsub($one['back_num'],$backPurchase,2)??0;
                         $data['number'] =$backPurchase;
 
                         Db::name('user_sign_log')->insert($data);
                         //总的减去采购款百分之十剩余的
-                        if(empty($wait)){
-                            UserSign::where('id',$one['id'])->update(
-                                [
-                                    'number'=>0,
-                                    'status'=>1
-                                ]
-                            );
-                        }else{
-                            //add
-                            UserSign::where('id',$one['id'])->update(
-                                [
-                                    'number'=>$wait
-                                ]
-                            );
-                        }
+//                        if(empty($wait)){
+//                            UserSign::where('id',$one['id'])->update(
+//                                [
+//                                    'number'=>0,
+//                                    'status'=>1
+//                                ]
+//                            );
+//                        }else{
+//                            //add
+//                            UserSign::where('id',$one['id'])->update(
+//                                [
+//                                    'number'=>$wait
+//                                ]
+//                            );
+//                        }
 
                         //并且加到对应的用户的采购款中
 //                        User::where('id',$order['uid'])->inc('purchase_funds',$wait)->update();
@@ -288,12 +288,12 @@ class PayNotifyLogic extends BaseLogic
                         $data['number'] =$one['number'];
                         //都存到对应的log日志
                         Db::name('user_sign_log')->insert($data);
-                        UserSign::where('id',$one['id'])->update(
-                            [
-                                'number'=>0,
-                                'status'=>1
-                            ]
-                        );
+//                        UserSign::where('id',$one['id'])->update(
+//                            [
+//                                'number'=>0,
+//                                'status'=>1
+//                            ]
+//                        );
                         //并且加到对应的用户的采购款中
 //                         User::where('id',$order['uid'])->inc('purchase_funds',$wait)->update();
                     }