api接口统一返回处理、插件钩子解耦扩展性提升

2021-01-07 11:03:12 +08:00 · 2021-01-07 11:03:12 +08:00 · e323f8a640
parent 36e22ff6d6
commit e323f8a640
5 changed files with 91 additions and 82 deletions
--- a/application/api/controller/Buy.php
+++ b/application/api/controller/Buy.php
@ -15,7 +15,6 @@ use app\service\GoodsService;
 use app\service\UserService;
 use app\service\PaymentService;
 use app\service\BuyService;
-use app\service\PluginsService;

 /**
 * 购买
@ -74,20 +73,6 @@ class Buy extends Common
                'common_site_type'  => (int) $buy_base['common_site_type'],
            ];

-            // 优惠劵
-            $ret = PluginsService::PluginsControlCall('coupon', 'coupon', 'buy', 'api', ['order_goods'=>$buy_goods, 'params'=>$params]);
-            if($ret['code'] == 0 && isset($ret['data']['code']) && $ret['data']['code'] == 0)
-            {
-                $result['plugins_coupon_data'] = $ret['data']['data'];
-            }
-
-            // 积分
-            $ret = PluginsService::PluginsControlCall('points', 'index', 'buy', 'api', ['order_goods'=>$buy_goods, 'params'=>$params]);
-            if($ret['code'] == 0 && isset($ret['data']['code']) && $ret['data']['code'] == 0)
-            {
-                $result['plugins_points_data'] = $ret['data']['data'];
-            }
-
            return BaseService::DataReturn($result);
        }
        return $buy_ret;
--- a/application/api/controller/Goods.php
+++ b/application/api/controller/Goods.php
@ -13,7 +13,6 @@ namespace app\api\controller;
 use app\service\BaseService;
 use app\service\GoodsService;
 use app\service\BuyService;
-use app\service\PluginsService;
 use app\service\GoodsCommentsService;
 use app\service\ResourcesService;
 use app\service\GoodsFavorService;
@ -151,22 +150,6 @@ class Goods extends Common
            $result['nav_submit_text'] = MyC('common_is_exhibition_mode_btn_text', '立即咨询', true);
        }

-        // 限时秒杀
-        $ret = PluginsService::PluginsControlCall(
-            'limitedtimediscount', 'index', 'goods', 'api', ['goods_id'=>$goods_id]);
-        if($ret['code'] == 0 && isset($ret['data']['code']) && $ret['data']['code'] == 0)
-        {
-            $result['plugins_limitedtimediscount_data'] = $ret['data']['data'];
-        }
-
-        // 优惠券
-        $ret = PluginsService::PluginsControlCall(
-                'coupon', 'index', 'goods', 'api', ['goods_id'=>$goods_id]);
-        if($ret['code'] == 0 && isset($ret['data']['code']) && $ret['data']['code'] == 0)
-        {
-            $result['plugins_coupon_data'] = $ret['data']['data'];
-        }
-
        return BaseService::DataReturn($result);
    }

--- a/application/api/controller/Index.php
+++ b/application/api/controller/Index.php
@ -14,7 +14,6 @@ use app\service\BaseService;
 use app\service\GoodsService;
 use app\service\BannerService;
 use app\service\AppHomeNavService;
-use app\service\PluginsService;
 use app\service\BuyService;

 /**
@ -50,21 +49,11 @@ class Index extends Common
 	{
 		// 返回数据
 		$result = [
-			'navigation'						=> AppHomeNavService::AppHomeNav(),
-			'banner_list'						=> BannerService::Banner(),
-			'data_list'							=> GoodsService::HomeFloorList(),
-			'common_cart_total'                 => BuyService::UserCartTotal(['user'=>$this->user]),
+			'navigation'		=> AppHomeNavService::AppHomeNav(),
+			'banner_list'		=> BannerService::Banner(),
+			'data_list'			=> GoodsService::HomeFloorList(),
+			'common_cart_total'	=> BuyService::UserCartTotal(['user'=>$this->user]),
 		];
-
-		// 限时秒杀
-		$ret = PluginsService::PluginsControlCall(
-            'limitedtimediscount', 'index', 'index', 'api');
-        if($ret['code'] == 0 && isset($ret['data']['code']) && $ret['data']['code'] == 0)
-        {
-            $result['plugins_limitedtimediscount_data'] = $ret['data']['data'];
-        }
-
-		// 返回数据
 		return BaseService::DataReturn($result);
 	}
 }
--- a/application/service/BaseService.php
+++ b/application/service/BaseService.php
@ -127,11 +127,12 @@ class BaseService
        $action_name = strtolower(request()->action());

        // 接口返回信息钩子
-        $hook_name = 'plugins_service_base_return_data_'.$module_name.'_'.$controller_name.'_'.$action_name;
+        $hook_name = 'plugins_service_base_data_return_'.$module_name.'_'.$controller_name.'_'.$action_name;
        Hook::listen($hook_name, [
            'hook_name'     => $hook_name,
            'is_backend'    => true,
            'data'          => &$data,
+            'params'        => input(),
        ]);

        return DataReturn('success', 0, $data);
--- a/application/tags.php
+++ b/application/tags.php
@ -84,24 +84,88 @@ return array (
  'plugins_service_users_center_left_menu_handle' => 
  array (
    0 => 'app\\plugins\\invoice\\Hook',
-    1 => 'app\\plugins\\distribution\\Hook',
-    2 => 'app\\plugins\\membershiplevelvip\\Hook',
-    3 => 'app\\plugins\\signin\\Hook',
+    1 => 'app\\plugins\\coupon\\Hook',
+    2 => 'app\\plugins\\distribution\\Hook',
+    3 => 'app\\plugins\\membershiplevelvip\\Hook',
+    4 => 'app\\plugins\\signin\\Hook',
  ),
  'plugins_service_header_navigation_top_right_handle' => 
  array (
    0 => 'app\\plugins\\invoice\\Hook',
-    1 => 'app\\plugins\\distribution\\Hook',
-    2 => 'app\\plugins\\membershiplevelvip\\Hook',
-    3 => 'app\\plugins\\signin\\Hook',
-    4 => 'app\\plugins\\exchangerate\\Hook',
+    1 => 'app\\plugins\\coupon\\Hook',
+    2 => 'app\\plugins\\distribution\\Hook',
+    3 => 'app\\plugins\\membershiplevelvip\\Hook',
+    4 => 'app\\plugins\\signin\\Hook',
+    5 => 'app\\plugins\\exchangerate\\Hook',
  ),
  'plugins_service_order_status_change_history_success_handle' => 
  array (
    0 => 'app\\plugins\\invoice\\Hook',
-    1 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\coupon\\Hook',
+    2 => 'app\\plugins\\distribution\\Hook',
+    3 => 'app\\plugins\\points\\Hook',
+  ),
+  'plugins_css' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+    1 => 'app\\plugins\\share\\Hook',
+    2 => 'app\\plugins\\membershiplevelvip\\Hook',
+    3 => 'app\\plugins\\exchangerate\\Hook',
+    4 => 'app\\plugins\\limitedtimediscount\\Hook',
+    5 => 'app\\plugins\\points\\Hook',
+  ),
+  'plugins_js' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+    1 => 'app\\plugins\\share\\Hook',
+    2 => 'app\\plugins\\exchangerate\\Hook',
+    3 => 'app\\plugins\\limitedtimediscount\\Hook',
+    4 => 'app\\plugins\\points\\Hook',
+  ),
+  'plugins_service_navigation_header_handle' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+    1 => 'app\\plugins\\membershiplevelvip\\Hook',
+    2 => 'app\\plugins\\limitedtimediscount\\Hook',
+    3 => 'app\\plugins\\points\\Hook',
+  ),
+  'plugins_view_goods_detail_panel_bottom' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+  ),
+  'plugins_view_buy_group_goods_inside_bottom' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+  ),
+  'plugins_service_buy_group_goods_handle' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+    1 => 'app\\plugins\\membershiplevelvip\\Hook',
    2 => 'app\\plugins\\points\\Hook',
  ),
+  'plugins_view_buy_form_inside' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+    1 => 'app\\plugins\\points\\Hook',
+  ),
+  'plugins_service_buy_order_insert_success' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+  ),
+  'plugins_service_user_register_end' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+  ),
+  'plugins_service_base_data_return_api_goods_detail' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+    1 => 'app\\plugins\\limitedtimediscount\\Hook',
+  ),
+  'plugins_service_base_data_return_api_buy_index' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+    1 => 'app\\plugins\\points\\Hook',
+  ),
  'plugins_service_order_aftersale_audit_handle_end' => 
  array (
    0 => 'app\\plugins\\distribution\\Hook',
@ -135,13 +199,15 @@ return array (
    0 => 'app\\plugins\\distribution\\Hook',
    1 => 'app\\plugins\\membershiplevelvip\\Hook',
    2 => 'app\\plugins\\exchangerate\\Hook',
-    3 => 'app\\plugins\\points\\Hook',
+    3 => 'app\\plugins\\limitedtimediscount\\Hook',
+    4 => 'app\\plugins\\points\\Hook',
  ),
  'plugins_service_goods_spec_base' => 
  array (
    0 => 'app\\plugins\\distribution\\Hook',
    1 => 'app\\plugins\\membershiplevelvip\\Hook',
    2 => 'app\\plugins\\exchangerate\\Hook',
+    3 => 'app\\plugins\\limitedtimediscount\\Hook',
  ),
  'plugins_view_goods_detail_panel_price_top' => 
  array (
@ -158,19 +224,6 @@ return array (
    0 => 'app\\plugins\\distribution\\Hook',
    1 => 'app\\plugins\\membershiplevelvip\\Hook',
  ),
-  'plugins_css' => 
-  array (
-    0 => 'app\\plugins\\share\\Hook',
-    1 => 'app\\plugins\\membershiplevelvip\\Hook',
-    2 => 'app\\plugins\\exchangerate\\Hook',
-    3 => 'app\\plugins\\points\\Hook',
-  ),
-  'plugins_js' => 
-  array (
-    0 => 'app\\plugins\\share\\Hook',
-    1 => 'app\\plugins\\exchangerate\\Hook',
-    2 => 'app\\plugins\\points\\Hook',
-  ),
  'plugins_view_common_bottom' => 
  array (
    0 => 'app\\plugins\\share\\Hook',
@ -184,16 +237,6 @@ return array (
  array (
    0 => 'app\\plugins\\share\\Hook',
  ),
-  'plugins_service_navigation_header_handle' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-    1 => 'app\\plugins\\points\\Hook',
-  ),
-  'plugins_service_buy_group_goods_handle' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-    1 => 'app\\plugins\\points\\Hook',
-  ),
  'plugins_service_user_login_success_record' => 
  array (
    0 => 'app\\plugins\\membershiplevelvip\\Hook',
@ -218,9 +261,17 @@ return array (
  array (
    0 => 'app\\plugins\\exchangerate\\Hook',
  ),
-  'plugins_view_buy_form_inside' => 
+  'plugins_view_goods_detail_base_top' => 
  array (
-    0 => 'app\\plugins\\points\\Hook',
+    0 => 'app\\plugins\\limitedtimediscount\\Hook',
+  ),
+  'plugins_view_home_floor_top' => 
+  array (
+    0 => 'app\\plugins\\limitedtimediscount\\Hook',
+  ),
+  'plugins_service_base_data_return_api_index_index' => 
+  array (
+    0 => 'app\\plugins\\limitedtimediscount\\Hook',
  ),
  'plugins_view_buy_base_confirm_top' => 
  array (