Commit 1e774b1f authored by zhuwei's avatar zhuwei

bug

parent 787af999
...@@ -128,14 +128,14 @@ class Remark extends Basic ...@@ -128,14 +128,14 @@ class Remark extends Basic
$data['data']['list'] = $u_phone_follow->getFollowList($pageNo, $pageSize, $order_ = 'id desc', $field, $where); $data['data']['list'] = $u_phone_follow->getFollowList($pageNo, $pageSize, $order_ = 'id desc', $field, $where);
foreach ($data['data']['list'] as $k=>$v) { foreach ($data['data']['list'] as $k=>$v) {
//dump($v); // dump($v);
//判断客户是否超过24小时保护期间 0:保护器内 1:超过保护期 //判断客户是否超过24小时保护期间 0:保护器内 1:超过保护期
/*$ser = new UserExpiredTimeService(); /*$ser = new UserExpiredTimeService();
$res = $ser->getExpiredTimeByUser($v["user_id"]); $res = $ser->getExpiredTimeByUser($v["user_id"]);
$data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1 ;*/ $data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1 ;*/
$is_outstrip_twenty_four_hours = 0; $is_outstrip_twenty_four_hours = 0;
if((time() - strtotime($v['create_time'])) > (60*60*24)){ if((time() - strtotime($v['u_create_time'])) > (60*60*24)){
$is_outstrip_twenty_four_hours = 1; $is_outstrip_twenty_four_hours = 1;
} }
$data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours; $data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
......
...@@ -280,9 +280,10 @@ class UPhoneFollowPp extends BaseModel ...@@ -280,9 +280,10 @@ class UPhoneFollowPp extends BaseModel
} }
if (!empty($v['user_id'])) { if (!empty($v['user_id'])) {
$user_data = $m_user->getUserById('user_name,user_phone,vip,agent_id', $v['user_id']); $user_data = $m_user->getUserById('user_name,user_phone,vip,agent_id,create_time', $v['user_id']);
$data[$k]['user_name'] = $user_data['user_name']; $data[$k]['user_name'] = $user_data['user_name'];
$data[$k]['user_phone'] = $user_data['user_phone']; $data[$k]['user_phone'] = $user_data['user_phone'];
$data[$k]['u_create_time'] = $user_data['create_time'];
$data[$k]['vip'] = $user_data['vip']; $data[$k]['vip'] = $user_data['vip'];
$data[$k]['agent_id'] = $user_data['agent_id']; //客户客方 $data[$k]['agent_id'] = $user_data['agent_id']; //客户客方
} }
......
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