Commit 401e435a authored by clone's avatar clone

成交报告详情增加收款信息

parent bc295790
...@@ -894,5 +894,17 @@ class PerformanceService ...@@ -894,5 +894,17 @@ class PerformanceService
return [ "code" => 200, "date" => $list ]; return [ "code" => 200, "date" => $list ];
} }
/**
* @param $bargain_id
* @return false|\PDOStatement|string|\think\Collection
*/
public function collectionList($bargain_id){
$paylogModel = new OPayLogModel();
$orderParams["bargain_id"] = $bargain_id;
$field_pay_log = "a.id,a.create_time,a.bargain_id,a.money,a.type,a.income_time,a.source,c.id as agent_id,c.name,d.store_name";
return $paylogModel->getPayLogByOrderId($field_pay_log,$orderParams);
}
} }
\ No newline at end of file
...@@ -22,6 +22,7 @@ class PerformanceValidate extends Validate ...@@ -22,6 +22,7 @@ class PerformanceValidate extends Validate
'push_id' => 'require', 'push_id' => 'require',
'is_forbidden' => 'require|in:0,1', 'is_forbidden' => 'require|in:0,1',
'operator_id' => 'require|number', 'operator_id' => 'require|number',
'bargain_id' => 'require|number',
]; ];
protected $message = [ protected $message = [
...@@ -39,6 +40,8 @@ class PerformanceValidate extends Validate ...@@ -39,6 +40,8 @@ class PerformanceValidate extends Validate
'is_forbidden.in' => '是否绑定字段值只能为0或1', 'is_forbidden.in' => '是否绑定字段值只能为0或1',
'operator_id.require' => '操作人为必填字段', 'operator_id.require' => '操作人为必填字段',
'operator_id.number' => '操作人编号只能为数字', 'operator_id.number' => '操作人编号只能为数字',
'bargain_id.require' => '成交报告编号为必填字段',
'bargain_id.number' => '成交报告编号只能为数字',
]; ];
protected $scene = [ protected $scene = [
...@@ -47,5 +50,6 @@ class PerformanceValidate extends Validate ...@@ -47,5 +50,6 @@ class PerformanceValidate extends Validate
'login' => [ 'phone', 'pwd', 'device_id', "push_id" ], 'login' => [ 'phone', 'pwd', 'device_id', "push_id" ],
'verifyStatus' => [ 'agent_id', 'device_id' ], 'verifyStatus' => [ 'agent_id', 'device_id' ],
'verifyIsForbidden' => [ 'phone', 'device_id', 'is_forbidden', 'operator_id' ], 'verifyIsForbidden' => [ 'phone', 'device_id', 'is_forbidden', 'operator_id' ],
'verifyCollectionList' => [ 'agent_id', 'bargain_id'],
]; ];
} }
\ No newline at end of file
...@@ -138,6 +138,9 @@ class OPayLogModel extends Model ...@@ -138,6 +138,9 @@ class OPayLogModel extends Model
if (isset($params["house_title"])) { if (isset($params["house_title"])) {
$where_["b.house_title"] = $params["house_title"]; $where_["b.house_title"] = $params["house_title"];
} }
if (isset($params["bargain_id"])) {
$where_["a.bargain_id"] = $params["bargain_id"];
}
$where_["a.is_del"] = 0; $where_["a.is_del"] = 0;
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
......
...@@ -710,14 +710,15 @@ Route::group('broker', [ ...@@ -710,14 +710,15 @@ Route::group('broker', [
'userFollowUpListV2' => ['api_broker/HomePageLog/userFollowUpListV2', ['method' => 'post|get']], 'userFollowUpListV2' => ['api_broker/HomePageLog/userFollowUpListV2', ['method' => 'post|get']],
'houseFollowUpList' => ['api_broker/HomePageLog/houseFollowUpList', ['method' => 'post']], 'houseFollowUpList' => ['api_broker/HomePageLog/houseFollowUpList', ['method' => 'post']],
'housingResource' => ['api_broker/Performance/housingResource', ['method' => 'POST|GET']], //获取房源list 'housingResource' => ['api_broker/Performance/housingResource', ['method' => 'POST|GET']], //获取房源list
'userResource' => ['api_broker/Performance/userResource', ['method' => 'POST|GET']], //获取客源list 'userResource' => ['api_broker/Performance/userResource', ['method' => 'POST|GET']], //获取客源list
'followList' => ['api_broker/Performance/followList', ['method' => 'POST|GET']], //报备list 'followList' => ['api_broker/Performance/followList', ['method' => 'POST|GET']], //报备list
'marchInList' => ['api_broker/Performance/marchInList', ['method' => 'POST|GET']], //进场list 'marchInList' => ['api_broker/Performance/marchInList', ['method' => 'POST|GET']], //进场list
'paylogList' => ['api_broker/Performance/paylogList', ['method' => 'POST|GET']], //收款list 'paylogList' => ['api_broker/Performance/paylogList', ['method' => 'POST|GET']], //收款list
'performanceList' => ['api_broker/Performance/performanceList', ['method' => 'POST|GET']], //业绩list 'performanceList' => ['api_broker/Performance/performanceList', ['method' => 'POST|GET']], //业绩list
'superviseList' => ['api_broker/Performance/superviseList', ['method' => 'POST|GET']], //监督执行list 'superviseList' => ['api_broker/Performance/superviseList', ['method' => 'POST|GET']], //监督执行list
'officialReceiptsList' => ['api_broker/Performance/officialReceiptsList', ['method' => 'POST|GET']], //实收list 'officialReceiptsList' => ['api_broker/Performance/officialReceiptsList', ['method' => 'POST|GET']], //实收list
'collectionListByBargainId' => ['api_broker/Performance/collectionListByBargainId', ['method' => 'POST|GET']], //实收list
'paylogListPcInfo' => ['api_broker/Performance/paylogListPcInfo', ['method' => 'POST|GET']], // 'paylogListPcInfo' => ['api_broker/Performance/paylogListPcInfo', ['method' => 'POST|GET']], //
'marchInListPcInfo' => ['api_broker/Performance/marchInListPcInfo', ['method' => 'POST|GET']], // 'marchInListPcInfo' => ['api_broker/Performance/marchInListPcInfo', ['method' => 'POST|GET']], //
......
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