财务日报

application/index/controller/DailyPaper.php

@@ -36,12 +36,12 @@ class DailyPaper extends Basic
     {
         header('Access-Control-Allow-Origin:*');
         $params = $this->params;
-        /*          $params = array(
-                      "store_id" => 730,//门店id
+                  $params = array(
+                      "store_id" => 0,//门店id
                       "is_store" => 0,//身份是否是店长，财务显示不一样  0店长 1财务
-                      "daily_data" => "2018-12-18"
+                      "daily_data" => "2019-06-03"
                   );
-                  $this->userId = 5775;*/
+                  $this->userId = 1;
         if (!isset($params["store_id"]) || !isset($params["is_store"]) || !isset($params["daily_data"])) {
             return $this->response("101", "请求参数错误");
         }

application/model/OfficeGRoom.php

@@ -247,6 +247,18 @@ class OfficeGRoom extends BaseModel
         return $result;
     }
 
+    public function getRoomInfo($field, $params)
+    {
+        $result = Db::table($this->table)
+            ->field($field)
+            ->alias("a")
+            ->join('office_g_building b', 'a.building_id = b.id', 'left')
+            ->where($params)
+            ->select();
+
+        return $result;
+    }
+
     /**
      * @param $page_no
      * @param $page_size

application/model/OfficeOPayLogModel.php

@@ -437,10 +437,10 @@ class OfficeOPayLogModel extends Model
     {
         return $this->db_->field($filed)
             ->alias("a")
-            ->join("o_order b", "a.order_id = b.id", "left")
+            ->join("office_o_order b", "a.order_id = b.id", "left")
            // ->join("o_bargain c", "c.order_id = b.id", "left")
-            ->join("o_bargain c", "c.id = a.bargain_id", "left")
-            ->join("o_report d", "a.report_id = d.id", "left")
+            ->join("office_o_bargain c", "c.id = a.bargain_id", "left")
+            ->join("office_o_report d", "a.report_id = d.id", "left")
             ->where($params)
             ->group("a.id")
             ->select();
@@ -476,8 +476,8 @@ class OfficeOPayLogModel extends Model
     {
         return $this->db_->field($filed)
             ->alias("a")
-            ->join("o_paylog_adjustment b", "a.id = b.paylog_id", "right")
-            ->join("o_order c", "a.order_id = c.id", "left")
+            ->join("office_o_paylog_adjustment b", "a.id = b.paylog_id", "right")
+            ->join("office_o_order c", "a.order_id = c.id", "left")
             ->where($params)
             ->select();
     }