Merge branch 'test'

application/model/SecretReport.php

@@ -119,7 +119,7 @@ class SecretReport extends Model
     public function getCallCollect($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '') {
 
         $data = $this->field($field)->alias('a')
-            ->join('agents b','a.agents_id=b.id','left')
+            ->join('a_agents b','a.agents_id=b.id','left')
             ->where($params)
             ->order($order_)
             ->limit($pageSize)
@@ -131,16 +131,16 @@ class SecretReport extends Model
         foreach ($data as $k => $v) {
             $result[$k] = $v;
             $result[$k]['price'] = "";
-            if ($v->agents_id) {
-                $agents_data =  Db::table('agents')->field('realName,father_id')->where('id',$v->agents_id)->find();
-                $result[$k]['agents_name'] = $agents_data['realName'];
-                $shop_data = Db::table('agents')->field('agentshopname,sub_shopname')->where('id',$agents_data['father_id'])->find();
-                $result[$k]['shop_name'] = $shop_data['sub_shopname'] ? $shop_data['agentshopname'].'-'.$shop_data['sub_shopname'] : $shop_data['agentshopname'];
-            } else {
+            if (empty($v['agents_id'])) {
                 $result[$k]['agents_name'] = "";            
+            } else {        
+                $agent = new AAgents();
+                $agent_data = $agent->getAgentsInfoByAgentId('a.name,b.store_name,c.district_name',['agent_id'=>$v['agents_id']]);
+                $result[$k]['agents_name'] = $agent_data[0]['name'];
+                $result[$k]['shop_name'] = $agent_data[0]['district_name'].'-'.$agent_data[0]['store_name'].'-'.$agent_data[0]['name'];
             }
 
-            $result[$k]['time']  = $v->time;
+            $result[$k]['time']  = $v['time'];
 
             //主叫收费
             if ($v['call_type'] == 0) {
@@ -161,7 +161,7 @@ class SecretReport extends Model
      */
     public function getCallCollectTotal($params) {
         return $this->alias('a')
-            ->join('agents b','a.agents_id=b.id','left')
+            ->join('a_agents b','a.agents_id=b.id','left')
             ->where($params)
             ->group('agents_id')
             ->count();

application/route.php

@@ -417,8 +417,8 @@ Route::group('broker', [
     'add_supervise' => ['api_broker/Supervise/add', ['method' => 'post']], //添加监督执行和门店拜访
     'addBargain' => ['api_broker/OrderLog/addBargain', [ 'method' => 'post' ] ], //新增成交报告佣金(分佣提成)
     'getSupervise' => ['api_broker/Supervise/getSupervise', [ 'method' => 'get' ] ], //监督执行列表
-    'sendSms' => ['api_broker/broker/sendSms', [ 'method' => 'post' ] ], //发送短信
-    'qrCode' => ['api_broker/broker/qrCode', [ 'method' => 'get' ] ], //生成二维码
+    'sendSms' => ['api_broker/broker/sendSms', [ 'method' => 'get' ] ], //发送短信
+    'qrCode' => ['api_broker/broker/qrCode', [ 'method' => 'get|post' ] ], //生成二维码
 
 
 

application/task/controller/UpdateShopStatusTask.php

@@ -51,7 +51,7 @@ class UpdateShopStatusTask
         $params                = [];
         $time_                 = date('Y-m-d', strtotime("-$day day"));
         $params["status"]      = 1;
-        $params["create_time"] = array( 'lt', $time_ . " 23:59:59");
+        $params["update_time"] = array( 'lt', $time_ . " 23:59:59");
         $params["is_execute"]  = 0;
 
         $result = $this->shopModel->getShopListByTime($field, $params);