diff --git a/application/admin/view/default/slide/module/operate.html b/application/admin/view/default/slide/module/operate.html
index 1103fc370b8e003b707c62a56758911570d23e57..13f789942b94d2785e37b2739f78b6793e57e0f3 100644
--- a/application/admin/view/default/slide/module/operate.html
+++ b/application/admin/view/default/slide/module/operate.html
@@ -3,7 +3,7 @@
详情
-
+
编辑
diff --git a/application/admin/view/default/user/module/operate.html b/application/admin/view/default/user/module/operate.html
index 077c17d9efbefbb0f50c0b7bed2402b5af9dc74a..1f065b026d1be983ebcff075ea7b189b1026ad84 100644
--- a/application/admin/view/default/user/module/operate.html
+++ b/application/admin/view/default/user/module/operate.html
@@ -3,7 +3,7 @@
详情
-
+
编辑
diff --git a/application/admin/view/default/warehouse/module/operate.html b/application/admin/view/default/warehouse/module/operate.html
index c665ac813e792185d32527909273ea6688d70fb9..4cd2f8c3c9d130a154d583a6bfb348f9f6d4dcae 100644
--- a/application/admin/view/default/warehouse/module/operate.html
+++ b/application/admin/view/default/warehouse/module/operate.html
@@ -3,7 +3,7 @@
详情
-
+
编辑
diff --git a/application/service/OrderService.php b/application/service/OrderService.php
index 2a071312aa05ebdf77334a08fad6b1a345c40cfe..bf0a747f1ca384f72e953355524a03243ebdab02 100755
--- a/application/service/OrderService.php
+++ b/application/service/OrderService.php
@@ -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'));
}
diff --git a/application/service/PayLogService.php b/application/service/PayLogService.php
index 5658729d1c48060458fd9dd5238b8d775e40afdb..ab8da62b51dea4147f9cf50ab811a71587456bb2 100755
--- a/application/service/PayLogService.php
+++ b/application/service/PayLogService.php
@@ -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']] : [];
}
}