Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
纵之格
ShopXO
提交
1f05267e
ShopXO
项目概览
纵之格
/
ShopXO
通知
394
Star
16
Fork
11
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1f05267e
编写于
12月 09, 2020
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
细节优化
上级
a2cbd72f
变更
30
隐藏空白更改
内联
并排
Showing
30 changed file
with
51 addition
and
40 deletion
+51
-40
application/admin/controller/Admin.php
application/admin/controller/Admin.php
+1
-0
application/admin/controller/Answer.php
application/admin/controller/Answer.php
+0
-1
application/admin/controller/Appcenternav.php
application/admin/controller/Appcenternav.php
+5
-9
application/admin/controller/Apphomenav.php
application/admin/controller/Apphomenav.php
+4
-6
application/admin/controller/Article.php
application/admin/controller/Article.php
+1
-0
application/admin/controller/Brand.php
application/admin/controller/Brand.php
+1
-0
application/admin/controller/Customview.php
application/admin/controller/Customview.php
+2
-0
application/admin/controller/Goodscomments.php
application/admin/controller/Goodscomments.php
+0
-1
application/admin/controller/Goodsparamstemplate.php
application/admin/controller/Goodsparamstemplate.php
+1
-0
application/admin/controller/Order.php
application/admin/controller/Order.php
+1
-2
application/admin/controller/Role.php
application/admin/controller/Role.php
+1
-0
application/admin/controller/Slide.php
application/admin/controller/Slide.php
+1
-0
application/admin/controller/User.php
application/admin/controller/User.php
+2
-1
application/admin/controller/Useraddress.php
application/admin/controller/Useraddress.php
+1
-0
application/admin/controller/Warehouse.php
application/admin/controller/Warehouse.php
+1
-0
application/admin/view/default/admin/module/operate.html
application/admin/view/default/admin/module/operate.html
+1
-1
application/admin/view/default/admin/save_info.html
application/admin/view/default/admin/save_info.html
+2
-2
application/admin/view/default/appcenternav/module/operate.html
...ation/admin/view/default/appcenternav/module/operate.html
+1
-1
application/admin/view/default/apphomenav/module/operate.html
...ication/admin/view/default/apphomenav/module/operate.html
+1
-1
application/admin/view/default/article/module/operate.html
application/admin/view/default/article/module/operate.html
+1
-1
application/admin/view/default/brand/module/operate.html
application/admin/view/default/brand/module/operate.html
+1
-1
application/admin/view/default/customview/save_info.html
application/admin/view/default/customview/save_info.html
+2
-2
application/admin/view/default/goodsparamstemplate/module/operate.html
...dmin/view/default/goodsparamstemplate/module/operate.html
+1
-1
application/admin/view/default/role/module/operate.html
application/admin/view/default/role/module/operate.html
+1
-1
application/admin/view/default/role/save_info.html
application/admin/view/default/role/save_info.html
+2
-2
application/admin/view/default/slide/module/operate.html
application/admin/view/default/slide/module/operate.html
+1
-1
application/admin/view/default/user/module/operate.html
application/admin/view/default/user/module/operate.html
+1
-1
application/admin/view/default/warehouse/module/operate.html
application/admin/view/default/warehouse/module/operate.html
+1
-1
application/service/OrderService.php
application/service/OrderService.php
+3
-3
application/service/PayLogService.php
application/service/PayLogService.php
+10
-1
未找到文件。
application/admin/controller/Admin.php
浏览文件 @
1f05267e
...
...
@@ -171,6 +171,7 @@ class Admin extends Common
]));
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
...
...
application/admin/controller/Answer.php
浏览文件 @
1f05267e
...
...
@@ -159,7 +159,6 @@ class Answer extends Common
// 参数
unset
(
$params
[
'id'
]);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
}
...
...
application/admin/controller/Appcenternav.php
浏览文件 @
1f05267e
...
...
@@ -133,20 +133,16 @@ class AppCenterNav extends Common
$ret
=
AppCenterNavService
::
AppCenterNavList
(
$data_params
);
$data
=
empty
(
$ret
[
'data'
][
0
])
?
[]
:
$ret
[
'data'
][
0
];
}
$this
->
assign
(
'data'
,
$data
);
//
所属平台
//
静态数据
$this
->
assign
(
'common_platform_type'
,
lang
(
'common_platform_type'
));
// app事件类型
$this
->
assign
(
'common_app_event_type'
,
lang
(
'common_app_event_type'
));
// 参数
$this
->
assign
(
'params'
,
$params
);
// 编辑器文件存放地址
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'editor_path_type'
,
'app_center_nav'
);
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
}
...
...
application/admin/controller/Apphomenav.php
浏览文件 @
1f05267e
...
...
@@ -133,18 +133,16 @@ class AppHomeNav extends Common
$ret
=
AppHomeNavService
::
AppHomeNavList
(
$data_params
);
$data
=
empty
(
$ret
[
'data'
][
0
])
?
[]
:
$ret
[
'data'
][
0
];
}
$this
->
assign
(
'data'
,
$data
);
// 静态数据
$this
->
assign
(
'common_platform_type'
,
lang
(
'common_platform_type'
));
$this
->
assign
(
'common_app_event_type'
,
lang
(
'common_app_event_type'
));
// 参数
$this
->
assign
(
'params'
,
$params
);
// 编辑器文件存放地址
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'editor_path_type'
,
'app_nav'
);
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'data'
,
$data
);
return
$this
->
fetch
();
}
...
...
application/admin/controller/Article.php
浏览文件 @
1f05267e
...
...
@@ -153,6 +153,7 @@ class Article extends Common
$this
->
assign
(
'editor_path_type'
,
'article'
);
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
...
...
application/admin/controller/Brand.php
浏览文件 @
1f05267e
...
...
@@ -158,6 +158,7 @@ class Brand extends Common
$this
->
assign
(
'editor_path_type'
,
'brand'
);
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
...
...
application/admin/controller/Customview.php
浏览文件 @
1f05267e
...
...
@@ -133,7 +133,9 @@ class CustomView extends Common
$ret
=
CustomViewService
::
CustomViewList
(
$data_params
);
$data
=
empty
(
$ret
[
'data'
][
0
])
?
[]
:
$ret
[
'data'
][
0
];
}
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
}
...
...
application/admin/controller/Goodscomments.php
浏览文件 @
1f05267e
...
...
@@ -147,7 +147,6 @@ class Goodscomments extends Common
// 参数
unset
(
$params
[
'id'
]);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
}
...
...
application/admin/controller/Goodsparamstemplate.php
浏览文件 @
1f05267e
...
...
@@ -164,6 +164,7 @@ class GoodsParamsTemplate extends Common
]));
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
...
...
application/admin/controller/Order.php
浏览文件 @
1f05267e
...
...
@@ -255,8 +255,7 @@ class Order extends Common
public
function
Pay
()
{
$params
=
$this
->
data_request
;
$params
[
'user'
]
=
$this
->
admin
;
$params
[
'user'
][
'user_name_view'
]
=
'管理员'
.
'-'
.
$this
->
admin
[
'username'
];
$params
[
'admin'
]
=
$this
->
admin
;
return
OrderService
::
AdminPay
(
$params
);
}
}
...
...
application/admin/controller/Role.php
浏览文件 @
1f05267e
...
...
@@ -153,6 +153,7 @@ class Role extends Common
]));
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
...
...
application/admin/controller/Slide.php
浏览文件 @
1f05267e
...
...
@@ -140,6 +140,7 @@ class Slide extends Common
$this
->
assign
(
'common_app_event_type'
,
lang
(
'common_app_event_type'
));
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'editor_path_type'
,
'slide'
);
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'data'
,
$data
);
...
...
application/admin/controller/User.php
浏览文件 @
1f05267e
...
...
@@ -182,7 +182,8 @@ class User extends Common
$this
->
assign
(
'common_gender_list'
,
lang
(
'common_gender_list'
));
// 数据
$this
->
assign
(
'data'
,
$data
);
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
}
...
...
application/admin/controller/Useraddress.php
浏览文件 @
1f05267e
...
...
@@ -150,6 +150,7 @@ class UserAddress extends Common
}
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
...
...
application/admin/controller/Warehouse.php
浏览文件 @
1f05267e
...
...
@@ -144,6 +144,7 @@ class Warehouse extends Common
$this
->
assign
(
'editor_path_type'
,
'warehouse'
);
// 数据
unset
(
$params
[
'id'
]);
$this
->
assign
(
'data'
,
$data
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
...
...
application/admin/view/default/admin/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -5,7 +5,7 @@
</button>
<!-- 非管理员不能操作 -->
{{if $module_data['id'] neq 1 or $module_data['id'] eq $admin['id']}}
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/admin/saveinfo', array
('id'=>$module_data['id'
]))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/admin/saveinfo', array
_merge($params, ['id'=>$module_data['id']
]))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/admin/save_info.html
浏览文件 @
1f05267e
...
...
@@ -4,10 +4,10 @@
<div
class=
"content-right"
>
<div
class=
"content"
>
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/admin/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/admin/index')}}"
>
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/admin/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/admin/index'
, $params
)}}"
>
<legend>
<span
class=
"am-text-default"
>
管理员{{if empty($data['id'])}}添加{{else /}}编辑{{/if}}
</span>
<a
href=
"{{:MyUrl('admin/admin/index')}}"
class=
"am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"
>
返回
</a>
<a
href=
"{{:MyUrl('admin/admin/index'
, $params
)}}"
class=
"am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"
>
返回
</a>
</legend>
<div
class=
"am-form-group"
>
<label>
用户名
<span
class=
"am-form-group-label-tips"
>
创建后不可更改
</span></label>
...
...
application/admin/view/default/appcenternav/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -3,7 +3,7 @@
<i
class=
"am-icon-eye"
></i>
<span>
详情
</span>
</button>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/appcenternav/saveinfo', array
('id'=>$module_data['id'
]))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/appcenternav/saveinfo', array
_merge($params, ['id'=>$module_data['id']
]))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/apphomenav/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -3,7 +3,7 @@
<i
class=
"am-icon-eye"
></i>
<span>
详情
</span>
</button>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/apphomenav/saveinfo', array
('id'=>$module_data['id'
]))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/apphomenav/saveinfo', array
_merge($params, ['id'=>$module_data['id']
]))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/article/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -3,7 +3,7 @@
<i
class=
"am-icon-eye"
></i>
<span>
详情
</span>
</button>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/article/saveinfo', array
('id'=>$module_data['id'
]))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/article/saveinfo', array
_merge($params, ['id'=>$module_data['id']
]))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/brand/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -3,7 +3,7 @@
<i
class=
"am-icon-eye"
></i>
<span>
详情
</span>
</button>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/brand/saveinfo', array
('id'=>$module_data['id'
]))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/brand/saveinfo', array
_merge($params, ['id'=>$module_data['id']
]))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/customview/save_info.html
浏览文件 @
1f05267e
...
...
@@ -4,10 +4,10 @@
<div
class=
"content-right"
>
<div
class=
"content"
>
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/customview/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/customview/index')}}"
>
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/customview/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/customview/index'
, $params
)}}"
>
<legend>
<span
class=
"am-text-default"
>
自定义页面{{if empty($data['id'])}}添加{{else /}}编辑{{/if}}
</span>
<a
href=
"{{:MyUrl('admin/customview/index')}}"
class=
"am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"
>
返回
</a>
<a
href=
"{{:MyUrl('admin/customview/index'
, $params
)}}"
class=
"am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"
>
返回
</a>
</legend>
<div
class=
"am-form-group"
>
<label>
标题
</label>
...
...
application/admin/view/default/goodsparamstemplate/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -3,7 +3,7 @@
<i
class=
"am-icon-eye"
></i>
<span>
详情
</span>
</button>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/goodsparamstemplate/saveinfo', array
('id'=>$module_data['id'
]))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/goodsparamstemplate/saveinfo', array
_merge($params, ['id'=>$module_data['id']
]))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/role/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -4,7 +4,7 @@
<span>
详情
</span>
</button>
{{if $module_data['id'] neq 1}}
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/role/saveinfo', array
('id'=>$module_data['id'
]))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/role/saveinfo', array
_merge($params, ['id'=>$module_data['id']
]))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/role/save_info.html
浏览文件 @
1f05267e
...
...
@@ -4,10 +4,10 @@
<div
class=
"content-right"
>
<div
class=
"content"
>
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/role/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/role/index')}}"
>
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/role/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/role/index'
, $params
)}}"
>
<legend>
<span
class=
"am-text-default"
>
角色{{if empty($data['id'])}}添加{{else /}}编辑{{/if}}
</span>
<a
href=
"{{:MyUrl('admin/role/index')}}"
class=
"am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"
>
返回
</a>
<a
href=
"{{:MyUrl('admin/role/index'
, $params
)}}"
class=
"am-fr am-text-sm am-margin-top-xs am-icon-mail-reply"
>
返回
</a>
</legend>
<div
class=
"am-form-group"
>
<label>
角色名称
</label>
...
...
application/admin/view/default/slide/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -3,7 +3,7 @@
<i
class=
"am-icon-eye"
></i>
<span>
详情
</span>
</button>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/slide/saveinfo', array
('id'=>$module_data['id'
]))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/slide/saveinfo', array
_merge($params, ['id'=>$module_data['id']
]))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/user/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -3,7 +3,7 @@
<i
class=
"am-icon-eye"
></i>
<span>
详情
</span>
</button>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/user/saveinfo', array_merge($params,
array('id'=>$module_data['id'])
))}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/user/saveinfo', array_merge($params,
['id'=>$module_data['id']]
))}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/admin/view/default/warehouse/module/operate.html
浏览文件 @
1f05267e
...
...
@@ -3,7 +3,7 @@
<i
class=
"am-icon-eye"
></i>
<span>
详情
</span>
</button>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/warehouse/saveinfo',
['id'=>$module_data['id']]
)}}"
>
<a
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-btn-block"
href=
"{{:MyUrl('admin/warehouse/saveinfo',
array_merge($params, ['id'=>$module_data['id']])
)}}"
>
<i
class=
"am-icon-edit"
></i>
<span>
编辑
</span>
</a>
...
...
application/service/OrderService.php
浏览文件 @
1f05267e
...
...
@@ -362,7 +362,7 @@ class OrderService
],
[
'checked_type'
=>
'empty'
,
'key_name'
=>
'
user
'
,
'key_name'
=>
'
admin
'
,
'error_msg'
=>
'管理员信息有误'
,
],
];
...
...
@@ -406,7 +406,7 @@ class OrderService
return
self
::
OrderPaymentUnderLineSuccess
([
'order'
=>
$order
,
'payment'
=>
$payment
,
'user'
=>
$params
[
'user'
]
,
'user'
=>
UserService
::
GetUserViewInfo
(
$order
[
'user_id'
])
,
'params'
=>
$params
,
]);
}
...
...
@@ -1044,7 +1044,7 @@ class OrderService
$currency_data
=
OrderCurrencyService
::
OrderCurrencyGroupList
(
array_column
(
$data
,
'id'
));
// 用户列表
if
(
in_array
(
'
warehouse
_id'
,
$keys
)
&&
isset
(
$params
[
'is_public'
])
&&
$params
[
'is_public'
]
==
0
)
if
(
in_array
(
'
user
_id'
,
$keys
)
&&
isset
(
$params
[
'is_public'
])
&&
$params
[
'is_public'
]
==
0
)
{
$user_list
=
UserService
::
GetUserViewInfo
(
array_column
(
$data
,
'user_id'
));
}
...
...
application/service/PayLogService.php
浏览文件 @
1f05267e
...
...
@@ -186,6 +186,9 @@ class PayLogService
$data
=
Db
::
name
(
'PayLog'
)
->
where
(
$where
)
->
field
(
$field
)
->
limit
(
$m
,
$n
)
->
order
(
$order_by
)
->
select
();
if
(
!
empty
(
$data
))
{
// 字段列表
$keys
=
ArrayKeys
(
$data
);
// 获取支付业务关联数据
$log_value_list
=
[];
$log_value
=
Db
::
name
(
'PayLogValue'
)
->
field
(
'pay_log_id,business_id,business_no'
)
->
where
([
'pay_log_id'
=>
array_column
(
$data
,
'id'
)])
->
select
();
...
...
@@ -195,6 +198,12 @@ class PayLogService
{
$log_value_list
[
$lv
[
'pay_log_id'
]][]
=
$lv
;
}
// 用户列表
if
(
in_array
(
'user_id'
,
$keys
)
&&
isset
(
$params
[
'is_public'
])
&&
$params
[
'is_public'
]
==
0
)
{
$user_list
=
UserService
::
GetUserViewInfo
(
array_column
(
$data
,
'user_id'
));
}
}
// 循环处理数据
...
...
@@ -205,7 +214,7 @@ class PayLogService
{
if
(
isset
(
$params
[
'is_public'
])
&&
$params
[
'is_public'
]
==
0
)
{
$v
[
'user'
]
=
UserService
::
GetUserViewInfo
(
$v
[
'user_id'
])
;
$v
[
'user'
]
=
(
!
empty
(
$user_list
)
&&
is_array
(
$user_list
)
&&
array_key_exists
(
$v
[
'user_id'
],
$user_list
))
?
$user_list
[
$v
[
'user_id'
]]
:
[]
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录