Merge branch 'test'

application/index/controller/ShareShop.php

@@ -43,7 +43,7 @@ class ShareShop extends Basic
                 $this->_wxApi->getWxCode($this->url.'?'.http_build_query($params));
             } else {
                 $userInfo = $this->_wxApi->getUserInfoByAccessToken($code);
-                Log::write($userInfo, 'WxCallbackUntils'); //记录日志
+                Log::write(json_encode($userInfo), 'WxCallbackUntils'); //记录日志
                 //dump($userInfo);exit;
                 if (!$userInfo['wx_open_id']) {
                     $this->_wxApi->getWxCode($this->url.'?'.http_build_query($params));
@@ -73,7 +73,7 @@ class ShareShop extends Basic
 
             }
         }
-        Log::write($params, 'WxCallbackUntils'); //记录日志
+        Log::write(json_encode($params), 'WxCallbackUntils'); //记录日志
 
         $this->assign('data',json_encode($params));
         return view("share_detail");

application/task/controller/PrivacyNumber.php

@@ -459,7 +459,7 @@ class PrivacyNumber
         $pageTotal = ceil($total / $pageSize);
 
         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])) {
                 continue;
             }
@@ -473,20 +473,22 @@ class PrivacyNumber
 
                 $where_agent['agents_id'] = $v['agents_id'];
                 $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'];
                 $time_arr = $this->m_secret_report->getListAll('time', $where_agent);
-                $minute = 0;
+                $minute = $time = 0;
+       
                 foreach ($time_arr as $t_val) {
-                    if ($t_val['time']%60 == 0){
-                        $minute += $t_val['time']/60;
+                    if ($t_val['time'] <= 60) {
+                        $minute += 1;
                     } 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['time'] = $v['time'];
+                $tmp_data['money'] = number_format($tmp_data['money'], 2);
+                $tmp_data['time'] = $time;
                 $tmp_data['phone'] = $v['phone_no'];
                 $tmp_data['agent_id'] = $v['agents_id'];
                 if (empty($call_data)) {