Skip to content

T
tl_estate
Commit b163621f authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 153abb9d 1771baa2
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
application/index/controller/ShareShop.php
View file @ b163621f
...@@ -43,7 +43,7 @@ class ShareShop extends Basic ...@@ -43,7 +43,7 @@ class ShareShop extends Basic
$this->_wxApi->getWxCode($this->url.'?'.http_build_query($params)); $this->_wxApi->getWxCode($this->url.'?'.http_build_query($params));
} else { } else {
$userInfo = $this->_wxApi->getUserInfoByAccessToken($code); $userInfo = $this->_wxApi->getUserInfoByAccessToken($code);
Log::write($userInfo, 'WxCallbackUntils'); //记录日志 Log::write(json_encode($userInfo), 'WxCallbackUntils'); //记录日志
//dump($userInfo);exit; //dump($userInfo);exit;
if (!$userInfo['wx_open_id']) { if (!$userInfo['wx_open_id']) {
$this->_wxApi->getWxCode($this->url.'?'.http_build_query($params)); $this->_wxApi->getWxCode($this->url.'?'.http_build_query($params));
...@@ -73,7 +73,7 @@ class ShareShop extends Basic ...@@ -73,7 +73,7 @@ class ShareShop extends Basic
} }
} }
Log::write($params, 'WxCallbackUntils'); //记录日志 Log::write(json_encode($params), 'WxCallbackUntils'); //记录日志
$this->assign('data',json_encode($params)); $this->assign('data',json_encode($params));
return view("share_detail"); return view("share_detail");
......
application/task/controller/PrivacyNumber.php
View file @ b163621f
...@@ -459,7 +459,7 @@ class PrivacyNumber ...@@ -459,7 +459,7 @@ class PrivacyNumber
$pageTotal = ceil($total / $pageSize); $pageTotal = ceil($total / $pageSize);
for ($pageNo = 1; $pageNo <= $pageTotal; $pageNo++) { for ($pageNo = 1; $pageNo <= $pageTotal; $pageNo++) {
$secret_data = $this->m_secret_report->getListGroupAll($pageNo, $pageSize, 'sum(time) as time,phone_no,agents_id', $where, 'phone_no'); $secret_data = $this->m_secret_report->getListGroupAll($pageNo, $pageSize, 'phone_no,agents_id', $where, 'phone_no');
if (empty($secret_data[0])) { if (empty($secret_data[0])) {
continue; continue;
} }
...@@ -473,20 +473,22 @@ class PrivacyNumber ...@@ -473,20 +473,22 @@ class PrivacyNumber
$where_agent['agents_id'] = $v['agents_id']; $where_agent['agents_id'] = $v['agents_id'];
$where_agent['phone_no'] = $v['phone_no']; $where_agent['phone_no'] = $v['phone_no'];
$where_agent['create_time'] = $where['create_time']; $where_agent['call_time'] = $where['call_time'];
$where_agent['time'] = $where['time']; $where_agent['time'] = $where['time'];
$time_arr = $this->m_secret_report->getListAll('time', $where_agent); $time_arr = $this->m_secret_report->getListAll('time', $where_agent);
$minute = 0; $minute = $time = 0;
foreach ($time_arr as $t_val) { foreach ($time_arr as $t_val) {
if ($t_val['time']%60 == 0){ if ($t_val['time'] <= 60) {
$minute += $t_val['time']/60; $minute += 1;
} else { } else {
$minute += $t_val['time']/60 + 1; $minute += ceil($t_val['time']/60);
} }
$time += $t_val['time'];
} }
$tmp_data['money'] = $minute * 0.055 + $minute * 0.04; $tmp_data['money'] = $minute * 0.055 + $minute * 0.04;
$tmp_data['money'] = number_format($tmp_data['money'], 2);
$tmp_data['time'] = $v['time']; $tmp_data['time'] = $time;
$tmp_data['phone'] = $v['phone_no']; $tmp_data['phone'] = $v['phone_no'];
$tmp_data['agent_id'] = $v['agents_id']; $tmp_data['agent_id'] = $v['agents_id'];
if (empty($call_data)) { if (empty($call_data)) {
......
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