Commit 484e621a authored by zw's avatar zw

bug

parent 1d0db78d
...@@ -61,7 +61,7 @@ class DailyPaperService ...@@ -61,7 +61,7 @@ class DailyPaperService
} }
$agent_info = $agent_info[0]; $agent_info = $agent_info[0];
//获取日报详情 //获取日报详情
$daily_info = $this->getDailyInfo($agent_id, $daily_data); $daily_info = $this->getDailyInfo($store_id, $daily_data);
//todo 获取各个list //todo 获取各个list
$result["list"] = $this->getPayLogList($store_id, $daily_data); $result["list"] = $this->getPayLogList($store_id, $daily_data);
//todo 统计入账出账等 //todo 统计入账出账等
...@@ -387,6 +387,7 @@ class DailyPaperService ...@@ -387,6 +387,7 @@ class DailyPaperService
*/ */
private function housePanInfo($house_id_str) private function housePanInfo($house_id_str)
{ {
echo $house_id_str;
$gModel = new GHousesToAgents(); $gModel = new GHousesToAgents();
$params["houses_id"] = array("in", ($house_id_str)); $params["houses_id"] = array("in", ($house_id_str));
$params["type"] = 2; $params["type"] = 2;
...@@ -598,19 +599,19 @@ class DailyPaperService ...@@ -598,19 +599,19 @@ class DailyPaperService
/** /**
* 获取提交的日报记录 * 获取提交的日报记录
* @param $agent_id * @param $store_id
* @param $daily_data * @param $daily_data
* @return false|\PDOStatement|string|\think\Collection * @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
private function getDailyInfo($agent_id, $daily_data) private function getDailyInfo($store_id, $daily_data)
{ {
$field_info_field = "id,agent_id,agent_name,daily_date,alipay,tenpay,realty_pay,family_pay,private_bank, $field_info_field = "id,agent_id,agent_name,daily_date,alipay,tenpay,realty_pay,family_pay,private_bank,
cash,pos,other_bank,status,create_time,update_time"; cash,pos,other_bank,status,create_time,update_time";
$daily_info_params["agent_id"] = $agent_id; $daily_info_params["store_id"] = $store_id;
$daily_info_params["daily_date"] = $daily_data; $daily_info_params["daily_date"] = $daily_data;
return $this->oDailyModel->getDailyList($field_info_field, $daily_info_params, 1, 1); return $this->oDailyModel->getDailyList($field_info_field, $daily_info_params, 1, 1);
......
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