From 8eb7c239a5cbbb14abfbdba43a4e9f1b70a29eda Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 30 May 2024 13:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php          |  2 ++
 app/common/logic/PayNotifyLogic.php         | 24 ---------------------
 app/common/logic/order/RetailOrderLogic.php |  8 -------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 7bcdfdf..77bffd3 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -119,6 +119,8 @@ class OrderLogic extends BaseLogic
                 $goods_list[$k]['nums'] = $v['cart_num'];
             }
             (new Cashierinfo())->saveAll($goods_list);
+            $where = ['is_pay' => 0, 'is_fail' => 0];
+            Cart::whereIn('cart_id', $cartId)->where($where)->update(['is_pay'=>1]);
             Db::commit();
             return $order;
         } catch (\Exception $e) {
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 45eb18b..7421be3 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -76,14 +76,6 @@ class PayNotifyLogic extends BaseLogic
             $order->status = 2;
             $financial_type2 = OrderEnum::CASHIER_ORDER_PAY;
         }
-        if ($order['cart_id']) {
-            if (!is_array($order['cart_id'])) {
-                $cart_arr = explode(',', $order['cart_id']);
-                Cart::whereIn('cart_id', $cart_arr)->update(['is_pay' => 1]);
-            } else {
-                Cart::whereIn('cart_id', $order['cart_id'])->update(['is_pay' => 1]);
-            }
-        }
         if ($order->pay_type != 9 || $order->pay_type != 10) {
             //用户支出流水
             $record[] = [
@@ -218,14 +210,6 @@ class PayNotifyLogic extends BaseLogic
         $order->paid = 1;
         $order->status = 2;
         $order->save();
-        if ($order['cart_id']) {
-            if (!is_array($order['cart_id'])) {
-                $cart_arr = explode(',', $order['cart_id']);
-                Cart::whereIn('cart_id', $cart_arr)->update(['is_pay' => 1]);
-            } else {
-                Cart::whereIn('cart_id', $order['cart_id'])->update(['is_pay' => 1]);
-            }
-        }
         //商户获得流水
         $record[] = [
             'financial_record_sn' => time(),
@@ -271,14 +255,6 @@ class PayNotifyLogic extends BaseLogic
             $order->status = 2;
             $financial_type2 = OrderEnum::CASHIER_ORDER_PAY;
         }
-        if ($order['cart_id']) {
-            if (!is_array($order['cart_id'])) {
-                $cart_arr = explode(',', $order['cart_id']);
-                Cart::whereIn('cart_id', $cart_arr)->update(['is_pay' => 1]);
-            } else {
-                Cart::whereIn('cart_id', $order['cart_id'])->update(['is_pay' => 1]);
-            }
-        }
         if ($order->pay_type != 9 || $order->pay_type != 10) {
             //用户支出流水
             $record[] = [
diff --git a/app/common/logic/order/RetailOrderLogic.php b/app/common/logic/order/RetailOrderLogic.php
index 8554edb..88c7d59 100644
--- a/app/common/logic/order/RetailOrderLogic.php
+++ b/app/common/logic/order/RetailOrderLogic.php
@@ -62,14 +62,6 @@ class RetailOrderLogic extends BaseLogic
             $order->money = $CallbackData['money'];
             $order->paid = 1;
             $order->save();
-            if ($order['cart_id']) {
-                if (!is_array($order['cart_id'])) {
-                    $cart_arr = explode(',', $order['cart_id']);
-                    Cart::whereIn('cart_id', $cart_arr)->update(['is_pay' => 1]);
-                } else {
-                    Cart::whereIn('cart_id', $order['cart_id'])->update(['is_pay' => 1]);
-                }
-            }
             Log::info('支付成功');
             // 提交事务
             Db::commit();