|
|
@@ -239,6 +239,11 @@ class AccountService extends BaseService
|
|
|
$query->where('a.user_id', $userId);
|
|
|
}
|
|
|
|
|
|
+ $storeId = isset($params['store_id']) ? $params['store_id'] : 0;
|
|
|
+ if ($storeId) {
|
|
|
+ $query->where('a.store_id', $storeId);
|
|
|
+ }
|
|
|
+
|
|
|
// 订单号搜索
|
|
|
if (!empty($orderNo)) {
|
|
|
$query->where('a.source_order_no', 'like', "%{$orderNo}%");
|
|
|
@@ -280,20 +285,8 @@ class AccountService extends BaseService
|
|
|
->toArray();
|
|
|
|
|
|
// 格式化数据
|
|
|
- $accountTypes = config('payment.accountTypes', [
|
|
|
- 1 => '商城消费',
|
|
|
- 2 => '充值缴费',
|
|
|
- 3 => '商城退款',
|
|
|
- 4 => '佣金提现',
|
|
|
- 5 => '提现驳回',
|
|
|
- 6 => '平台入款'
|
|
|
- ]);
|
|
|
-
|
|
|
foreach ($list as &$item) {
|
|
|
$item['create_time_text'] = date('Y-m-d H:i:s', (int)$item['create_time']);
|
|
|
- $item['type_text'] = $item['remark'] ?: ($accountTypes[$item['type']] ?? '收支明细');
|
|
|
- $item['money'] = number_format($item['money'], 2, '.', '');
|
|
|
- $item['before_money'] = number_format($item['before_money'], 2, '.', '');
|
|
|
$item['status_text'] = ['', '已完成', '待处理', '失败/取消'][$item['status']] ?? '未知';
|
|
|
}
|
|
|
|