Skip to content

T
tl_estate
Commit a3087876 authored by hujun's avatar hujun
Browse files
Options

bargain_id

parent 08161df2
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 12 deletions
application/api_broker/controller/OrderLog.php
View file @ a3087876
......@@ -181,7 +181,8 @@ class OrderLog extends Basic
$income_time = isset($params["income_time"]) ? $params["income_time"] : "";
$received_money = isset($params["received_money"]) ? $params["received_money"] : "";
$type_ext = isset($params["type_ext"]) ? $params["type_ext"] : "";
$is_ok = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"],$params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source,$income_time, $received_money, $type_ext);
$bargain_id = isset($params['bargain_id']) ? $params['bargain_id'] : 0;
$is_ok = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"],$params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source,$income_time, $received_money, $type_ext, $bargain_id);
if ($is_ok > 0) {
return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
......@@ -203,7 +204,7 @@ class OrderLog extends Basic
if (!isset($params["agent_id"]) || !isset($params["report_id"]) ||
!isset($params["order_id"]) || !isset($params["order_no"]) | !isset($params["collecting_bill"]) ||
!isset($params["house_number"]) || !isset($params["industry_type"]) ) {
!isset($params["house_number"]) || !isset($params["industry_type"]) || !isset($params['bargain_id'])) {
return $this->response("101", "请求参数错误");
}
......@@ -250,7 +251,7 @@ class OrderLog extends Basic
$is_ok = $this->service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"],
$params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"],
$remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id,
$receipt_number,$transfer_name, $received_money, $type_ext);
$receipt_number,$transfer_name, $received_money, $type_ext, $params['bargain_id']);
if ($is_ok > 0) {
return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
......
application/api_broker/service/OrderLogService.php
View file @ a3087876
......@@ -65,7 +65,7 @@ class OrderLogService
* @throws \think\exception\DbException
*/
public function addCollectingBillV2($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
$industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext)
$industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext, $bargain_id)
{
$bill_arr = $params = [];
$father_id = 0;
......@@ -73,11 +73,11 @@ class OrderLogService
if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
if ($father_id == 0) {
$params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no,
$house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext);
$house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext, $bargain_id);
$father_id = $this->payLogModel->insertPayLog($params);
} else {
array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no,
$house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext));
$house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext, $bargain_id));
}
}
}
......@@ -126,7 +126,7 @@ class OrderLogService
*/
public function addCollectingBill($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
$industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend,
$last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money, $type_ext)
$last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id)
{
$bill_arr = $params = [];
$father_id = 0;
......@@ -148,12 +148,12 @@ class OrderLogService
if ($father_id == 0) {
$params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id,
$order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source, $income_time,
$is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext);
$is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id);
$father_id = $this->payLogModel->insertPayLog($params);
} else {
array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name,
$report_id, $order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
$income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext));
$income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id));
}
}
}
......@@ -288,11 +288,13 @@ class OrderLogService
* @param $receipt_number
* @param $transfer_name
* @param $received_money
* @param $type_ext
* @param $bargain_id
* @return mixed
*/
private function collectingBillBin($father_id, $collecting_arr, $agent_id, $agent_name, $report_id, $order_id,
$order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
$income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext)
$income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id)
{
$arr["report_id"] = $report_id;
......@@ -316,6 +318,7 @@ class OrderLogService
$arr["is_dividend"] = $is_dividend;
$arr["received_money"] = $received_money;
$arr["type_ext"] = $type_ext;
$arr["bargain_id"] = $bargain_id;
if ($income_time) {
$arr["income_time"] = date("Y-m-d H:i:s", $income_time);
}
......
application/index/controller/Finance.php
View file @ a3087876
......@@ -3071,7 +3071,7 @@ class Finance extends Basic
$params = $this->params;
if (empty($params["agent_id"]) || empty($params["report_id"]) ||
empty($params["order_id"]) || empty($params["order_no"]) | empty($params["collecting_bill"]) ||
!isset($params["house_number"]) || !isset($params["industry_type"]) ) {
!isset($params["house_number"]) || !isset($params["industry_type"]) || !isset($params['bargain_id'])) {
return $this->response("101", "请求参数错误");
}
......@@ -3118,7 +3118,7 @@ class Finance extends Basic
$service_ = new OrderLogService();
$is_ok = $service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"],
$params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"],
$remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id, $receipt_number,$transfer_name, $received_money, $type_ext);
$remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id, $receipt_number,$transfer_name, $received_money, $type_ext, $params['bargain_id']);
if ($is_ok > 0) {
return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
......
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