|
|
@@ -127,7 +127,6 @@ class AccountService extends BaseService
|
|
|
foreach ($list['data'] as &$item) {
|
|
|
$item['create_time_text'] = date('Y-m-d H:i:s', (int)$item['create_time']);
|
|
|
$item['update_time_text'] = date('Y-m-d H:i:s', (int)$item['update_time']);
|
|
|
- $item['status_text'] = ['', '已完成', '待处理', '失败/取消'][$item['status']] ?? '未知';
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -287,7 +286,6 @@ class AccountService extends BaseService
|
|
|
// 格式化数据
|
|
|
foreach ($list as &$item) {
|
|
|
$item['create_time_text'] = date('Y-m-d H:i:s', (int)$item['create_time']);
|
|
|
- $item['status_text'] = ['', '已完成', '待处理', '失败/取消'][$item['status']] ?? '未知';
|
|
|
}
|
|
|
|
|
|
return [
|
|
|
@@ -322,25 +320,6 @@ class AccountService extends BaseService
|
|
|
$info = $info->toArray();
|
|
|
$info['create_time_text'] = date('Y-m-d H:i:s', (int)$info['create_time']);
|
|
|
$info['update_time_text'] = date('Y-m-d H:i:s', (int)$info['update_time']);
|
|
|
-
|
|
|
- $accountTypes = [
|
|
|
- 1 => '商城消费',
|
|
|
- 2 => '充值缴费',
|
|
|
- 3 => '商城退款',
|
|
|
- 4 => '佣金提现',
|
|
|
- 5 => '提现驳回',
|
|
|
- 6 => '平台入款',
|
|
|
- 7 => '商家佣金',
|
|
|
- 8 => '代理收益',
|
|
|
- 9 => '推广收益'
|
|
|
- ];
|
|
|
- $type = isset($info['type']) ? intval($info['type']) : 0;
|
|
|
- $info['type_text'] = $accountTypes[$type] ?? '未知';
|
|
|
- $info['status_text'] = ['', '已完成', '待处理', '失败/取消'][$info['status']] ?? '未知';
|
|
|
-
|
|
|
- $info['money'] = number_format($info['money'], 2, '.', '');
|
|
|
- $info['before_money'] = number_format($info['before_money'], 2, '.', '');
|
|
|
-
|
|
|
return [
|
|
|
'code' => 0,
|
|
|
'msg' => '获取成功',
|
|
|
@@ -360,7 +339,7 @@ class AccountService extends BaseService
|
|
|
'source_order_no' => $params['source_order_no'] ?? '',
|
|
|
'type' => (int)($params['type'] ?? 1),
|
|
|
'money' => (float)($params['money'] ?? 0),
|
|
|
- 'before_money' => (float)($params['before_money'] ?? 0),
|
|
|
+ 'after_money' => (float)($params['after_money'] ?? 0),
|
|
|
'remark' => $params['remark'] ?? '',
|
|
|
'status' => (int)($params['status'] ?? 1),
|
|
|
'create_time' => time(),
|
|
|
@@ -405,8 +384,8 @@ class AccountService extends BaseService
|
|
|
if (isset($params['money'])) {
|
|
|
$log->money = (float)$params['money'];
|
|
|
}
|
|
|
- if (isset($params['before_money'])) {
|
|
|
- $log->before_money = (float)$params['before_money'];
|
|
|
+ if (isset($params['after_money'])) {
|
|
|
+ $log->before_money = (float)$params['after_money'];
|
|
|
}
|
|
|
if (isset($params['remark'])) {
|
|
|
$log->remark = $params['remark'];
|