bug

application/api/controller/ConvertOrder.php

@@ -34,6 +34,7 @@ class ConvertOrder extends Basic
     private $marchInModel;
     private $refundModel;
     private $journalaccountsModel;
+    private $houseModel;
 
     public function __construct($request = null)
     {
@@ -45,6 +46,7 @@ class ConvertOrder extends Basic
         $this->marchInModel         = new OMarchInModel();
         $this->refundModel          = new RefundTables();
         $this->journalaccountsModel = new JournalAccounts();
+        $this->houseModel           = new GHouses();
         parent::__construct($request);
     }
 
@@ -116,10 +118,13 @@ class ConvertOrder extends Basic
         ob_flush();
     }
 
+    /**
+     * 下定
+     */
     public function convertCollectingBill()
     {
         set_time_limit(0);
-        $time_              = array( 'between', array( "2016-04-18 23:59:59", "2018-01-18 23:59:59" ) );
+        $time_              = array( 'between', array( "2016-04-18 23:59:59", "2018-04-17 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  = [];
@@ -283,8 +288,8 @@ class ConvertOrder extends Basic
      */
     private function orderBin($order_no, $f_id, $house_id, $create_time, $update_time)
     {
-        $houseModel           = new GHouses();
-        $houseResult          = $houseModel->getHouseDetail("id,internal_title", [ "id" => $house_id ]);
+
+        $houseResult          = $this->houseModel->getHouseDetail("id,internal_title", [ "id" => $house_id ]);
         $house_title          = count($houseResult) > 0 && isset($houseResult["internal_title"]) ? $houseResult["internal_title"] : null;
         $param["order_no"]    = $order_no;
         $param["f_id"]        = $f_id;