Commit 43528cc3 authored by clone's avatar clone

1

parent d76b10bf
...@@ -36,12 +36,12 @@ class DailyPaper extends Basic ...@@ -36,12 +36,12 @@ class DailyPaper extends Basic
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( $params = array(
"store_id" => 0,//门店id "store_id" => 730,//门店id
"is_store" => 0,//身份是否是店长,财务显示不一样 0店长 1财务 "is_store" => 0,//身份是否是店长,财务显示不一样 0店长 1财务
"daily_data" => "2019-06-03" "daily_data" => "2019-06-13"
); );
$this->userId = 1;*/ $this->userId = 5775;
if (!isset($params["store_id"]) || !isset($params["is_store"]) || !isset($params["daily_data"])) { if (!isset($params["store_id"]) || !isset($params["is_store"]) || !isset($params["daily_data"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
......
...@@ -457,12 +457,14 @@ class OfficeOPayLogModel extends Model ...@@ -457,12 +457,14 @@ class OfficeOPayLogModel extends Model
*/ */
public function selectPayLogListByBargainReport($filed,$params) public function selectPayLogListByBargainReport($filed,$params)
{ {
return $this->db_->field($filed) $result = $this->db_->field($filed)
->alias("a") ->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_report d", "a.report_id = d.id", "left") ->join("office_o_report d", "a.report_id = d.id", "left")
->where($params) ->where($params)
->select(); ->select();
//echo $this->getLastSql();
return $result;
} }
......
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