Skip to content

T
tl_estate
Commit 17aee377 authored by hujun's avatar hujun
Browse files
Options

修改

parent d0b94cab
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
application/index/controller/Coupon.php
View file @ 17aee377
...@@ -38,16 +38,13 @@ class Coupon extends Basic ...@@ -38,16 +38,13 @@ class Coupon extends Basic
$list = $this->m_coupon->getList($page_no, $page_size, 'id desc', $field, $where); $list = $this->m_coupon->getList($page_no, $page_size, 'id desc', $field, $where);
$total = $this->m_coupon->getTotal($where); $total = $this->m_coupon->getTotal($where);
$m_user = new Users(); $m_user = new Users();
$field_activity = 'money,return_action,activity_start_time,activity_end_time'; $field_activity = 'money,return_action';
foreach ($list as $k => $v) { foreach ($list as $k => $v) {
$activity_data = $this->m_activity->getFind($field_activity, ['id'=>$v['activity_id']]); $activity_data = $this->m_activity->getFind($field_activity, ['id'=>$v['activity_id']]);
$list[$k]['money'] = $activity_data['money']; $list[$k]['money'] = $activity_data['money'];
$list[$k]['return_action'] = $activity_data['return_action']; $list[$k]['return_action'] = $activity_data['return_action'];
$list[$k]['activity_start_time'] = $activity_data['activity_start_time'];
$list[$k]['activity_end_time'] = $activity_data['activity_end_time'];
$list[$k]['user_id'] = $v['user_id']; $list[$k]['user_id'] = $v['user_id'];
$list[$k]['user_name'] = ''; $list[$k]['user_phone'] = $m_user->getUserByWhereValue('user_phone', ['id'=>$v['user_id']]);
$list[$k]['user_phone'] = '';
} }
$data['total'] = $total; $data['total'] = $total;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment