Skip to content

T
tl_estate
Commit 0c380e14 authored by zhuwei's avatar zhuwei
Browse files
Options

1

parent 375bb679
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 107 deletions
application/api/controller/Shop.php
View file @ 0c380e14
...@@ -235,8 +235,7 @@ class Shop extends Basic ...@@ -235,8 +235,7 @@ class Shop extends Basic
} }
#商铺视频 #商铺视频
$house_id = 148; $result[$key]['shop_videos'] = $s_house->getHouseVideoList($val['id']);
$result[$key]['shop_videos'] = $s_house->getHouseVideoList($house_id);
// $result[$key]['shop_videos_length'] = $s_house->getHouseVideoLength(); // $result[$key]['shop_videos_length'] = $s_house->getHouseVideoLength();
} }
...@@ -416,8 +415,7 @@ class Shop extends Basic ...@@ -416,8 +415,7 @@ class Shop extends Basic
#商铺视频 #商铺视频
$s_house = new HouseService(); $s_house = new HouseService();
$house_id = 148; $result['shop_videos'] = $s_house->getHouseVideoList($params["id"]);
$result['shop_videos'] = $s_house->getHouseVideoList($house_id);
$result['shop_videos_length'] = $s_house->getHouseVideoLength(); $result['shop_videos_length'] = $s_house->getHouseVideoLength();
......
application/index/controller/ImageDepot.php
View file @ 0c380e14
...@@ -189,107 +189,15 @@ class ImageDepot extends Basic ...@@ -189,107 +189,15 @@ class ImageDepot extends Basic
// $is_report = $user_service->isReport($agent_id,$user_id); // $is_report = $user_service->isReport($agent_id,$user_id);
// dump($is_report); // dump($is_report);
big_log('cehsi'); // big_log('cehsi');
// $service = new HouseService(); $service = new HouseService();
// $house_id = 148; $house_id = 148;
//
// $result = $service->getHouseVideoList($house_id); $result = $service->getHouseVideoList($house_id);
// dump($result); dump($result);
//
// [ info ] pre2.tonglianjituan.com/broker/collectingBill [运行时间：0.174455s][吞吐率：5.73req/s] [内存消耗：2,411.84kb] [文件加载：108]
// [ info ] [ LANG ] /wwwdata/webroot/work/tl_test/thinkphp/lang/zh-cn.php
// [ info ] [ ROUTE ] array (
// 'type' => 'module',
// 'module' =>
// array (
// 0 => 'api_broker',
// 1 => 'OrderLog',
// 2 => 'collectingBill',
// ),
// 'convert' => false,
// )
// [ info ] [ HEADER ] array (
// 'user-agent' => 'okhttp/3.6.0',
// 'accept-encoding' => 'gzip',
// 'content-type' => 'application/x-www-form-urlencoded',
// 'content-length' => '702',
// 'connection' => 'close',
// 'x-forwarded-for' => '222.72.98.31',
// 'x-real-ip' => '222.72.98.31',
// 'host' => 'pre2.tonglianjituan.com',
// )
// [ info ] [ PARAM ] array (
// 'receipt_number' => '',
// 'bargain_id' => '208',
// 'remark' => '',
// 'house_number' => '不会',
// 'order_id' => '408',
// 'transfer_img' => '["20190327\\/201903271002187669.png"]',
// 'income_time' => '1553652097',
// 'order_no' => '1553052493506695',
// 'last_transfer_time' => '0',
// 'transfer_name' => '看看',
// 'collecting_bill' => '[{"type":91,"pay_type":11,"money":"666"}]',
// 'agent_name' => '测试2',
// 'AuthToken' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1Nzc1LCJuYW1lIjoiXHU2ZDRiXHU4YmQ1MiIsInBob25lIjoiMTU2MDE2NTIzNTIiLCJsZXZlbCI6MjB9LCJ0aW1lU3RhbXBfIjoxNTUzNTY2NTIwfQ.zm_H90tTb9p_SYNm2enzAapp-L_WJQcw84a-ErVlSD0',
// 'report_id' => '416',
// 'is_dividend' => '0',
// 'type_ext' => '0',
// 'agent_id' => '5775',
// 'industry_type' => '就你',
// 'received_money' => '666',
// )
// [ 2019-03-27T10:06:59+08:00 ] 172.17.0.4 172.17.0.1 POST /broker/collectingBill
// [ info ] pre2.tonglianjituan.com/broker/collectingBill [运行时间：0.162616s][吞吐率：6.15req/s] [内存消耗：2,308.40kb] [文件加载：108]
// [ info ] [ LANG ] /wwwdata/webroot/work/tl_test/thinkphp/lang/zh-cn.php
// [ info ] [ ROUTE ] array (
// 'type' => 'module',
// 'module' =>
// array (
// 0 => 'api_broker',
// 1 => 'OrderLog',
// 2 => 'collectingBill',
// ),
// 'convert' => false,
// )
// [ info ] [ HEADER ] array (
// 'user-agent' => 'okhttp/3.6.0',
// 'accept-encoding' => 'gzip',
// 'content-type' => 'application/x-www-form-urlencoded',
// 'content-length' => '660',
// 'connection' => 'close',
// 'x-forwarded-for' => '222.72.98.31',
// 'x-real-ip' => '222.72.98.31',
// 'host' => 'pre2.tonglianjituan.com',
// )
// [ info ] [ PARAM ] array (
// 'receipt_number' => '565222837',
// 'bargain_id' => '0',
// 'remark' => '',
// 'house_number' => '不会',
// 'order_id' => '408',
// 'transfer_img' => '["20190327\\/201903271006566750.png"]',
// 'income_time' => '1553652377',
// 'order_no' => '1553052493506695',
// 'last_transfer_time' => '1553652386',
// 'transfer_name' => '555',
// 'collecting_bill' => '[{"type":30,"pay_type":20,"money":"7151"}]',
// 'agent_name' => '测试2',
// 'AuthToken' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1Nzc1LCJuYW1lIjoiXHU2ZDRiXHU4YmQ1MiIsInBob25lIjoiMTU2MDE2NTIzNTIiLCJsZXZlbCI6MjB9LCJ0aW1lU3RhbXBfIjoxNTUzNTY2NTIwfQ.zm_H90tTb9p_SYNm2enzAapp-L_WJQcw84a-ErVlSD0',
// 'report_id' => '416',
// 'agent_id' => '5775',
// 'industry_type' => '就你',
// )
http://pre2.tonglianjituan.com/broker/reportListForPc?start_time=&end_time=&report_agent_name=&report_agent_phone=&internal_title=&user_phone=&order_id=&AuthToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjoxLCJuYW1lIjoiXHU3YmExXHU3NDA2XHU1NDU4IiwicGhvbmUiOiJyb290IiwibGV2ZWwiOjQwfSwidGltZVN0YW1wXyI6MTU1MzY0OTgyOX0.YrtbIfazsr0bT3v60VhbVafX7s-9OhW5NmQU3-FJW_Y&type=1&agent_id=1&site_id=&shop_id=&internal_address=&user_id=&pageNo=1&pageSize=10
} }
......
application/index/controller/Report.php
View file @ 0c380e14
...@@ -93,7 +93,7 @@ class Report extends Basic ...@@ -93,7 +93,7 @@ class Report extends Basic
//商铺ID //商铺ID
if (!empty($this->params['shop_id'])) { if (!empty($this->params['shop_id'])) {
$where['c.house_id'] = $this->params['shop_id'] ; $where['c.id'] = $this->params['shop_id'] ;
} }
//客户ID //客户ID
......
application/index/service/HouseService.php
View file @ 0c380e14
...@@ -1028,7 +1028,7 @@ class HouseService ...@@ -1028,7 +1028,7 @@ class HouseService
{ {
$m_video = new GHousesVideo(); $m_video = new GHousesVideo();
$field = 'id,video_name,upload_id,check_name,create_time,check_time'; $field = 'id,video_name,video_image,upload_id,check_name,create_time,check_time';
$params['house_id'] = $house_id; $params['house_id'] = $house_id;
$params['is_del'] = 0; $params['is_del'] = 0;
$params['check_id'] = ['>', 0]; $params['check_id'] = ['>', 0];
...@@ -1052,6 +1052,7 @@ class HouseService ...@@ -1052,6 +1052,7 @@ class HouseService
$result_[$k]['upload_name'] = $upload['name']; $result_[$k]['upload_name'] = $upload['name'];
$result_[$k]['upload_phone'] = $upload['phone']; $result_[$k]['upload_phone'] = $upload['phone'];
$result_[$k]['video_image'] = $v['video_image'] ? $internet_path.$v['video_image'] : 'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg'; $result_[$k]['video_image'] = $v['video_image'] ? $internet_path.$v['video_image'] : 'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg';
// $result_[$k]['video_image'] = 'https://s2.ax1x.com/2019/03/28/AwtDv4.png';
$result_[$k]['video_path'] = $internet_path.$v['video_name']; $result_[$k]['video_path'] = $internet_path.$v['video_name'];
$result_[$k]['create_time'] = $v['create_time']; $result_[$k]['create_time'] = $v['create_time'];
$result_[$k]['check_time'] = $v['check_time']; $result_[$k]['check_time'] = $v['check_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