From ecf137039d29bf429ee52b4ae97dca30baf3d381 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 24 Feb 2022 14:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/service/ConstService.php   |  2 +-
 app/service/OrderService.php   |  8 +-------
 app/service/PaymentService.php | 22 ++++++++++++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/service/ConstService.php b/app/service/ConstService.php
index b4a31ffc6..2d8aedfd9 100644
--- a/app/service/ConstService.php
+++ b/app/service/ConstService.php
@@ -33,7 +33,7 @@ class ConstService
     public static function Run($key = '', $default = null)
     {
         // 数据定义
-        $container =  self::ConstData();
+        $container = self::ConstData();
 
         // 匹配数据
         // 空 key 则返回全部
diff --git a/app/service/OrderService.php b/app/service/OrderService.php
index 572a28a45..31ac46315 100755
--- a/app/service/OrderService.php
+++ b/app/service/OrderService.php
@@ -972,19 +972,13 @@ class OrderService
             // 虚拟商品自动触发发货操作
             if($order['order_model'] == 3)
             {
-                $ret = self::OrderDeliveryHandle([
+                self::OrderDeliveryHandle([
                     'id'                => $order['id'],
                     'creator'           => 0,
                     'creator_name'      => '系统',
                     'user_id'           => $order['user_id'],
                     'user_type'         => 'admin',
                 ]);
-                if($ret['code'] != 0)
-                {
-                    // 事务回滚
-                    Db::rollback();
-                    return $ret;
-                }
             }
         }
 
diff --git a/app/service/PaymentService.php b/app/service/PaymentService.php
index c086fcf87..eb8fd5905 100755
--- a/app/service/PaymentService.php
+++ b/app/service/PaymentService.php
@@ -229,21 +229,31 @@ class PaymentService
      */
     public static function BuyPaymentList($params = [])
     {
-        $data = self::PaymentList($params);
-        $result = [];
-        if(!empty($data))
+        $res = self::PaymentList($params);
+        $data = [];
+        if(!empty($res))
         {
-            foreach($data as $v)
+            foreach($res as $v)
             {
                 // 根据终端类型筛选
                 if(in_array(APPLICATION_CLIENT_TYPE, $v['apply_terminal']))
                 {
                     unset($v['config'], $v['element'], $v['apply_terminal'], $v['author'], $v['author_url'], $v['is_open_user'], $v['is_enable']);
-                    $result[] = $v;
+                    $data[] = $v;
                 }
             }
         }
-        return $result;
+
+        // 支付方式下单选择列表钩子
+        $hook_name = 'plugins_service_payment_buy_list';
+        MyEventTrigger($hook_name, [
+            'hook_name'     => $hook_name,
+            'is_backend'    => true,
+            'params'        => $params,
+            'data'          => &$data,
+        ]);
+
+        return $data;
     }
 
     /**