Commit 09b3db26 authored by clone's avatar clone

1

parent befd5b46
...@@ -134,15 +134,15 @@ class DailyPaperService ...@@ -134,15 +134,15 @@ class DailyPaperService
*/ */
private function getSum($store_id, $daily_data) private function getSum($store_id, $daily_data)
{ {
$ids = $this->getAgentsByStoreId($store_id); /* $ids = $this->getAgentsByStoreId($store_id);
if (!$ids) { if (!$ids) {
return null; return null;
} }*/
//中介费入账 //中介费入账
$field = "money"; $field = "money";
$params["agent_id"] = array("in", ($ids)); $params["reckon_in_store"] = $store_id;
$params["is_del"] = 0; $params["is_del"] = 0;
$params["create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59")); $params["create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
$payLogModel = new OPayLogModel(); $payLogModel = new OPayLogModel();
$officePayLogModel = new OfficeOPayLogModel(); $officePayLogModel = new OfficeOPayLogModel();
...@@ -150,10 +150,10 @@ class DailyPaperService ...@@ -150,10 +150,10 @@ class DailyPaperService
$sum_office = $officePayLogModel->getSum($field, $params); $sum_office = $officePayLogModel->getSum($field, $params);
$info["sum_arr"] = $sum_shop + $sum_office; $info["sum_arr"] = $sum_shop + $sum_office;
$field_adjustment = "b.money"; $field_adjustment = "b.money";
$params_adjustment["a.agent_id"] = array("in", ($ids)); $params_adjustment["a.reckon_in_store"] = $store_id;
$params_adjustment["b.is_del"] = 0; $params_adjustment["b.is_del"] = 0;
$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 = $payLogModel->getAdjustmentSum($field_adjustment, $params_adjustment); $adjustment_shop = $payLogModel->getAdjustmentSum($field_adjustment, $params_adjustment);
$adjustment_office = $officePayLogModel->getAdjustmentSum($field_adjustment, $params_adjustment); $adjustment_office = $officePayLogModel->getAdjustmentSum($field_adjustment, $params_adjustment);
......
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