Commit b61a0373 authored by clone's avatar clone

1

parent 15a450ff
......@@ -19,6 +19,7 @@ class Coupon extends Basic
{
private $m_coupon;
private $m_activity;
public function __construct(Request $request = null)
{
parent::__construct($request);
......@@ -26,7 +27,8 @@ class Coupon extends Basic
$this->m_activity = new CActivity();
}
public function couponList() {
public function couponList()
{
if (!$this->request->isAjax()) {
return view('cashBackList');
}
......@@ -40,11 +42,11 @@ class Coupon extends Basic
$m_user = new Users();
$field_activity = 'money,return_action';
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]['return_action'] = $activity_data['return_action'];
$list[$k]['user_id'] = $v['user_id'];
$list[$k]['user_phone'] = $m_user->getUserByWhereValue('user_phone', ['id'=>$v['user_id']]);
$list[$k]['user_phone'] = $m_user->getUserByWhereValue('user_phone', ['id' => $v['user_id']]);
$list[$k]['user_phone'] = substr_replace($list[$k]['user_phone'], '****', 3, 4);
}
......@@ -57,7 +59,8 @@ class Coupon extends Basic
* @param $params
* @return array
*/
protected function binWhere($params) {
protected function binWhere($params)
{
$where = [];
if (isset($params['start_time']) && isset($params['end_time'])) {
......
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