bug

application/api/controller/ConvertOrder.php

@@ -59,7 +59,7 @@ class ConvertOrder extends Basic
         set_time_limit(0);
         //todo old num convert new table. first select page report num.
         //$params    = $this->params;
-        $time_ = array( 'between', array( "2016-04-18 23:59:59", "2018-04-17 23:59:59" ) );
+        $time_ = array( 'between', array( "2018-04-17 23:59:59", "2018-05-13 23:59:59" ) );
 
 
         $total     = $this->appliesModel->getAppliesCount([ "a.created" => $time_ ]);
@@ -77,6 +77,7 @@ class ConvertOrder extends Basic
                     if (count($userInfo) > 1) {
                         $reportParam = $this->reportBin($item["id"], $item["agent_id"], $item["phone"], $item["realname"], $item["agent_shop_id"], $userInfo["id"], $userInfo["user_phone"]
                             , $userInfo["user_name"], $item["vehicle"], $item["agent_shop_id"], $item["receptiontime"], $item["created"], $item["modified"]);
+                       // dump($reportParam);exit;
                         $f_id        = $this->reportModel->addReport($reportParam);
                         if ($f_id > 0) {
                             $orderParam = $this->orderBin($this->createOrderNumber(), $f_id, $item["house_id"], $item["created"], $item["modified"]);
@@ -98,7 +99,7 @@ class ConvertOrder extends Basic
     public function convertMarchIn()
     {
         set_time_limit(0);
-        $time_ = array( 'between', array( "2016-04-18 23:59:59", "2018-04-17 23:59:59" ) );
+        $time_ = array( 'between', array(  "2018-04-17 23:59:59", "2018-05-13 23:59:59" ) );
 
         $total      = $this->remarksModel->getRemarksCount([ "a.created" => $time_ ]);
         $pageSize   = 200;
@@ -124,7 +125,7 @@ class ConvertOrder extends Basic
     public function convertCollectingBill()
     {
         set_time_limit(0);
-        $time_              = array( 'between', array( "2016-04-18 23:59:59", "2018-04-17 23:59:59" ) );
+        $time_              = array( 'between', array( "2018-04-17 23:59:59", "2018-05-13 23:59:59" ) );
         $field              = "a.type,a.moneytype,a.money,a.trademark,a.remarks,a.created,a.modified,d.id as agent_id,b.id as report_id,c.id as order_id,c.order_no";
         $collectingBillList = $this->journalaccountsModel->getJournalAccountsListByStatus(1, 2000, $field, [ "a.created" => $time_ ]);
         $collectingBillArr  = [];

application/api_broker/controller/Shop.php

@@ -46,8 +46,8 @@ class Shop extends Basic
     {
         /*$params = array(
             "site_area"           => 4, //来源 1c首页  2c搜索 3b首页 4b搜索
-            "title"               => "vv", //1，2 external_title  ,3,4internal_title
-            "house_id"            => 1,
+           // "title"               => "vv", //1，2 external_title  ,3,4internal_title
+            "house_id"            => 4,
             "is_carefully_chosen" => 0, //精选商铺--0否1是
             "shop_type"           => 0, //商铺类型（0商场，1街铺）
             "disc"                => "黄浦区",
@@ -170,7 +170,7 @@ class Shop extends Basic
         //获取图片信息
         foreach ($result as $key => $val) {
             $result[$key]["api_path"]   = CK_IMG_URL . 'images/';
-            $result[$key]["rent_price"] = $result[$key]["rent_price"] * 0.01;
+            $result[$key]["rent_price"] = $val["rent_price"] * 0.01;
 
             $param["house_id"]      = $val["id"];
             $param["img_type"]      = 1; //默认主图

application/model/OReportModel.php

@@ -46,6 +46,7 @@ class OReportModel extends Model
             Db::rollback();
             return 0;
         }
+
     }
 
     /**