Commit a026da3a authored by clone's avatar clone

1

parent f638538a
...@@ -301,10 +301,10 @@ class DailyPaperService ...@@ -301,10 +301,10 @@ class DailyPaperService
$params["a.type"] = 91; $params["a.type"] = 91;
$params["c.father_id"] = 0; $params["c.father_id"] = 0;
$agency_fee_shop = $this->getHouseAndAgentInfo( $agency_fee_shop = $this->getHouseAndAgentInfo(
$payLogModel->selectPayLogListByBargain($field . ",1 as type", $params) $payLogModel->selectPayLogListByBargain($field . ",1 as types", $params)
); );
$agency_fee_office = $this->getHouseAndAgentInfo( $agency_fee_office = $this->getHouseAndAgentInfo(
$officePayLogModel->selectPayLogListByBargain($field . ",2 as type", $params), 2 $officePayLogModel->selectPayLogListByBargain($field . ",2 as types", $params), 2
); );
$info["agency_fee"] = array_merge($agency_fee_shop, $agency_fee_office); $info["agency_fee"] = array_merge($agency_fee_shop, $agency_fee_office);
...@@ -325,10 +325,10 @@ class DailyPaperService ...@@ -325,10 +325,10 @@ class DailyPaperService
//案场费入账 盘方 //案场费入账 盘方
$params["a.type"] = 92; $params["a.type"] = 92;
$case_fee_arr_shop = $payLogModel->selectPayLogListByBargain($field . ",1 as type", $params); $case_fee_arr_shop = $payLogModel->selectPayLogListByBargain($field . ",1 as types", $params);
$case_fee_shop = $this->getHouseAndAgentInfo($this->getHousePan($case_fee_arr_shop)); $case_fee_shop = $this->getHouseAndAgentInfo($this->getHousePan($case_fee_arr_shop));
$case_fee_arr_office = $officePayLogModel->selectPayLogListByBargain($field . ",2 as type", $params); $case_fee_arr_office = $officePayLogModel->selectPayLogListByBargain($field . ",2 as types", $params);
$case_fee_office = $this->getHouseAndAgentInfo($this->getHousePan($case_fee_arr_office), 2); $case_fee_office = $this->getHouseAndAgentInfo($this->getHousePan($case_fee_arr_office), 2);
$info["case_fee"] = array_merge($case_fee_shop, $case_fee_office); $info["case_fee"] = array_merge($case_fee_shop, $case_fee_office);
...@@ -353,20 +353,20 @@ class DailyPaperService ...@@ -353,20 +353,20 @@ class DailyPaperService
$params["a.type"] = 10; $params["a.type"] = 10;
unset($params["c.father_id"]); unset($params["c.father_id"]);
$earnest_money_shop = $this->getHouseAndAgentInfo( $earnest_money_shop = $this->getHouseAndAgentInfo(
$payLogModel->selectPayLogListByBargainReport($field_money . ",1 as type", $params) $payLogModel->selectPayLogListByBargainReport($field_money . ",1 as types", $params)
); );
$earnest_money_office = $this->getHouseAndAgentInfo( $earnest_money_office = $this->getHouseAndAgentInfo(
$officePayLogModel->selectPayLogListByBargainReport($field_money . ",2 as type", $params), 2 $officePayLogModel->selectPayLogListByBargainReport($field_money . ",2 as types", $params), 2
); );
$info["earnest_money"] = array_merge($earnest_money_shop, $earnest_money_office); $info["earnest_money"] = array_merge($earnest_money_shop, $earnest_money_office);
//保管金 //保管金
$params["a.type"] = 30; $params["a.type"] = 30;
$custody_money_shop = $this->getHouseAndAgentInfo( $custody_money_shop = $this->getHouseAndAgentInfo(
$payLogModel->selectPayLogListByBargainReport($field_money . ",1 as type", $params) $payLogModel->selectPayLogListByBargainReport($field_money . ",1 as types", $params)
); );
$custody_money_office = $this->getHouseAndAgentInfo( $custody_money_office = $this->getHouseAndAgentInfo(
$officePayLogModel->selectPayLogListByBargainReport($field_money . ",2 as type", $params), 2 $officePayLogModel->selectPayLogListByBargainReport($field_money . ",2 as types", $params), 2
); );
$info["custody_money"] = array_merge($custody_money_shop, $custody_money_office); $info["custody_money"] = array_merge($custody_money_shop, $custody_money_office);
...@@ -380,10 +380,10 @@ class DailyPaperService ...@@ -380,10 +380,10 @@ class DailyPaperService
$params_adjustment["b.create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59")); $params_adjustment["b.create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
$adjustment_shop = $this->getHouseAndAgentInfo( $adjustment_shop = $this->getHouseAndAgentInfo(
$payLogModel->selectAdjustmentList($field_adjustment . ",1 as type", $params_adjustment) $payLogModel->selectAdjustmentList($field_adjustment . ",1 as types", $params_adjustment)
); );
$adjustment_office = $this->getHouseAndAgentInfo( $adjustment_office = $this->getHouseAndAgentInfo(
$officePayLogModel->selectAdjustmentList($field_adjustment . ",2 as type", $params_adjustment), 2 $officePayLogModel->selectAdjustmentList($field_adjustment . ",2 as types", $params_adjustment), 2
); );
$info["adjustment"] = array_merge($adjustment_shop, $adjustment_office); $info["adjustment"] = array_merge($adjustment_shop, $adjustment_office);
return $info; return $info;
......
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