Skip to content

ShopXO
ShopXO

jamesyang1999 / ShopXO
与 Fork 源项目一致

Fork自 纵之格 / ShopXO

通知 1
Star 0
Fork 0
ShopXO
ShopXO

体验新版 GitCode，发现更多精彩内容 >>

提交 c36c32e9 编写于 作者: D devil_gong
浏览文件
操作

钩子返回信息优化

上级 ff14f6d9
隐藏空白更改
内联 并排
Showing with 95 addition and 69 deletion
application/common.php
浏览文件 @ c36c32e9
......@@ -11,6 +11,30 @@
// 应用公共文件
/**
* 钩子返回数据处理，是否存在错误
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2019-12-02
* @desc description
* @param [array] $data [钩子返回的数据]
*/
function HookReturnHandle($data)
{
if(!empty($data) && is_array($data))
{
foreach($data as $v)
{
if(is_array($v) && isset($v['code']) && $v['code'] != 0)
{
return $v;
}
}
}
return DataReturn('无钩子信息', 0);
}
/**
* 附件地址处理
* @author Devil
......
application/index/view/default/order/detail.html
浏览文件 @ c36c32e9
......@@ -295,7 +295,7 @@
<span data-am-modal-close class="am-close">&times;</span>
</div>
<div class="am-popup-bd">
<div id="map" data-level="17" style="width: 100%; height: 100%;"></div>
<div id="map" data-level="17"></div>
</div>
</div>
</div>
......
application/service/ArticleService.php
浏览文件 @ c36c32e9
......@@ -247,13 +247,13 @@ class ArticleService
// 文章保存处理钩子
$hook_name = 'plugins_service_article_save_handle';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'data' => &$data,
'article_id' => isset($params['id']) ? intval($params['id']) : 0,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......
application/service/BrandService.php
浏览文件 @ c36c32e9
......@@ -324,13 +324,13 @@ class BrandService
// 品牌保存处理钩子
$hook_name = 'plugins_service_brand_save_handle';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'data' => &$data,
'brand_id' => isset($params['id']) ? intval($params['id']) : 0,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......
application/service/BuyService.php
浏览文件 @ c36c32e9
......@@ -703,12 +703,12 @@ class BuyService
// 生成订单数据处理钩子
$hook_name = 'plugins_service_buy_handle';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'data' => &$result,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -905,13 +905,13 @@ class BuyService
// 订单添加前钩子
$hook_name = 'plugins_service_buy_order_insert_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'order' => &$order,
'params' => $params,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -1070,13 +1070,13 @@ class BuyService
// 订单详情添加前钩子
$hook_name = 'plugins_service_buy_order_detail_insert_begin';
$ret = Hook::listen($hook_name, [
$ret = HHookReturnHandle(ook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'user_id' => $user_id,
'order_id' => $order_id,
'data' => &$data,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -1112,13 +1112,13 @@ class BuyService
// 订单取货码添加前钩子
$hook_name = 'plugins_service_buy_order_extraction_code_insert_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'user_id' => $user_id,
'order_id' => $order_id,
'data' => &$data,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -1156,7 +1156,7 @@ class BuyService
// 订单虚拟数据添加前钩子
$hook_name = 'plugins_service_buy_order_fictitious_insert_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'user_id' => $user_id,
......@@ -1164,7 +1164,7 @@ class BuyService
'order_detail_id' => $order_detail_id,
'goods_id' => $goods_id,
'data' => &$data,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -1213,13 +1213,13 @@ class BuyService
// 订单地址添加前钩子
$hook_name = 'plugins_service_buy_order_receive_address_insert_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'user_id' => $user_id,
'order_id' => $order_id,
'data' => &$data,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......
application/service/ConfigService.php
浏览文件 @ c36c32e9
......@@ -299,7 +299,7 @@ class ConfigService
// 自提点地址列表数据钩子
$hook_name = 'plugins_service_site_extraction_address_list';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'data' => &$data,
......
application/service/GoodsService.php
浏览文件 @ c36c32e9
......@@ -284,13 +284,13 @@ class GoodsService
{
// 商品处理前钩子
$hook_name = 'plugins_service_goods_handle_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'goods' => &$v,
'goods_id' => isset($v['id']) ? $v['id'] : 0,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -427,13 +427,13 @@ class GoodsService
// 商品处理后钩子
$hook_name = 'plugins_service_goods_handle_end';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'goods' => &$v,
'goods_id' => isset($v['id']) ? $v['id'] : 0,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -1147,14 +1147,14 @@ class GoodsService
// 商品保存处理钩子
$hook_name = 'plugins_service_goods_save_handle';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'data' => &$data,
'spec' => $specifications['data'],
'goods_id' => isset($params['id']) ? intval($params['id']) : 0,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -2038,13 +2038,13 @@ class GoodsService
// 商品获取规格钩子
$hook_name = 'plugins_service_goods_spec_base';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => $params,
'data' => &$data,
'goods_id' => $goods_id
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -2149,13 +2149,13 @@ class GoodsService
// 商品获取规格类型钩子
$hook_name = 'plugins_service_goods_spec_type';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => $params,
'data' => &$data,
'goods_id' => $goods_id
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......
application/service/NavigationService.php
浏览文件 @ c36c32e9
......@@ -53,7 +53,7 @@ class NavigationService
}
// 大导航钩子
$hook_name = 'plugins_service_navigation_header_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......@@ -77,7 +77,7 @@ class NavigationService
// 底部导航钩子
$hook_name = 'plugins_service_navigation_footer_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......@@ -560,7 +560,7 @@ class NavigationService
// 顶部小导航右侧钩子
$hook_name = 'plugins_service_header_navigation_top_right_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......@@ -617,7 +617,7 @@ class NavigationService
// 用户中心资料修改展示字段钩子
$hook_name = 'plugins_service_users_personal_show_field_list_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......@@ -665,7 +665,7 @@ class NavigationService
// 用户安全项列表钩子
$hook_name = 'plugins_service_users_safety_panel_list_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......@@ -820,7 +820,7 @@ class NavigationService
// 用户中心左侧菜单钩子
$hook_name = 'plugins_service_users_center_left_menu_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......@@ -887,7 +887,7 @@ class NavigationService
// 网站底部导航
$hook_name = 'plugins_service_bottom_navigation_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......
application/service/OrderAftersaleService.php
浏览文件 @ c36c32e9
......@@ -865,12 +865,12 @@ class OrderAftersaleService
// 订单售后审核处理完毕钩子
$hook_name = 'plugins_service_order_aftersale_audit_handle_end';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => $params,
'order_id' => $order['data']['id'],
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
Db::rollback();
......
application/service/OrderService.php
浏览文件 @ c36c32e9
......@@ -411,12 +411,12 @@ class OrderService
// 订单支付成功处理前钩子
$hook_name = 'plugins_service_order_pay_handle_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'order_id' => $params['order']['id']
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -475,12 +475,12 @@ class OrderService
// 订单支付成功处理完毕钩子
$hook_name = 'plugins_service_order_pay_success_handle_end';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => $params,
'order_id' => $params['order']['id']
]);
]));
// 虚拟商品自动触发发货操作
if($params['order']['order_model'] == 3)
......@@ -662,13 +662,13 @@ class OrderService
{
// 订单处理前钩子
$hook_name = 'plugins_service_order_handle_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'order' => &$v,
'order_id' => $v['id']
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -830,13 +830,13 @@ class OrderService
// 订单处理后钩子
$hook_name = 'plugins_service_order_handle_end';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'order' => &$v,
'order_id' => $v['id']
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -974,7 +974,7 @@ class OrderService
{
// 订单状态改变添加日志钩子
$hook_name = 'plugins_service_order_status_change_history_success_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'data' => $data,
......
application/service/ResourcesService.php
浏览文件 @ c36c32e9
......@@ -189,7 +189,7 @@ class ResourcesService
{
// 附件上传后处理钩子
$hook_name = 'plugins_service_attachment_handle_end';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......@@ -240,11 +240,11 @@ class ResourcesService
{
// 附件列表处理前钩子
$hook_name = 'plugins_service_attachment_list_handle_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'data' => &$v,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -256,11 +256,11 @@ class ResourcesService
// 附件列表处理后钩子
$hook_name = 'plugins_service_attachment_list_handle_end';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'data' => &$v,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......
application/service/SafetyService.php
浏览文件 @ c36c32e9
......@@ -113,13 +113,13 @@ class SafetyService
{
// 用户登录密码修改钩子
$hook_name = 'plugins_service_user_login_pwd_update';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => ['accounts'=>$accounts, 'pwd'=>$pwd],
'user_id' => $user_id,
'user' => Db::name('User')->field('id,username,nickname,mobile,email,gender,avatar,province,city,birthday')->where(['id'=>$user_id])->find(),
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -440,13 +440,13 @@ class SafetyService
// 账号修改钩子
$hook_name = 'plugins_service_user_accounts_update';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => ['accounts'=>$user[$field], 'new_accounts'=>$params['accounts'], 'field'=>$field],
'user_id' => $user['id'],
'user' => Db::name('User')->field('id,username,nickname,mobile,email,gender,avatar,province,city,birthday')->where(['id'=>$user['id']])->find(),
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......
application/service/SystemService.php
浏览文件 @ c36c32e9
......@@ -33,7 +33,7 @@ class SystemService
public static function SystemBegin($params = [])
{
$hook_name = 'plugins_service_system_begin';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......@@ -52,7 +52,7 @@ class SystemService
public static function SystemEnd($params = [])
{
$hook_name = 'plugins_service_system_end';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
......
application/service/UserService.php
浏览文件 @ c36c32e9
......@@ -327,13 +327,13 @@ class UserService
// 用户保存处理钩子
$hook_name = 'plugins_service_user_save_handle';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'data' => &$data,
'user_id' => isset($params['id']) ? intval($params['id']) : 0,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -816,7 +816,7 @@ class UserService
// 用户登录成功信息纪录钩子
$hook_name = 'plugins_service_user_login_success_record';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'user' => &$user,
......@@ -991,12 +991,12 @@ class UserService
// 用户登录前钩子
$hook_name = 'plugins_service_user_login_begin';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'user_id' => $user['id']
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -1036,14 +1036,14 @@ class UserService
// 用户登录后钩子
$hook_name = 'plugins_service_user_login_end';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'user_id' => $user_id,
'user' => Db::name('User')->field('id,username,nickname,mobile,email,gender,avatar,province,city,birthday')->where(['id'=>$user_id])->find(),
'body_html' => &$body_html,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -1833,14 +1833,14 @@ class UserService
// 注册成功后钩子
$hook_name = 'plugins_service_user_register_end';
$ret = Hook::listen($hook_name, [
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => &$params,
'user_id' => $user_id,
'user' => Db::name('User')->field('id,username,nickname,mobile,email,gender,avatar,province,city,birthday')->where(['id'=>$user_id])->find(),
'body_html' => &$body_html,
]);
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
......@@ -2077,7 +2077,7 @@ class UserService
// 用户退出钩子
$hook_name = 'plugins_service_user_logout_handle';
$ret = Hook::listen($hook_name, [
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => [],
......
public/static/index/default/css/common.css
浏览文件 @ c36c32e9
......@@ -804,10 +804,11 @@ legend {
border-bottom: 1px solid #e5e5e5;
}
legend .legend-title {
font-size: 14px;
font-size: 12px;
}
legend a {
legend a.am-fr {
color: #e7747f;
margin-top: 10px;
}
.items-value-empty {
color: #999;
......
public/static/index/default/css/order.detail.css
浏览文件 @ c36c32e9
......@@ -233,6 +233,7 @@ strong.total-price-content { color: #d2364c; }
*/
#popup-extraction-receive-map .am-popup-bd,
#map {
width: 100%;
height: 100%;
padding: 0;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或