Skip to content

T
tl_estate
Commit 66a84a40 authored by zw's avatar zw
Browse files
Options

Merge remote-tracking branch 'origin/1210-v3.0.2' into 1210-v3.0.2

parents 4b2473c9 2e391d3f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
application/index/controller/Finance.php
View file @ 66a84a40
......@@ -2877,7 +2877,8 @@ class Finance extends Basic
$remark = isset($params["remark"]) ? $params["remark"] : "";
$transfer_img = isset($params["transfer_img"]) ? $params["transfer_img"]: "";
$income_time = isset($params["income_time"]) ? $params["income_time"] : "";
$income_time = isset($params["income_time"]) ? strtotime($params["income_time"]) : "";
$last_transfer_time = isset($params["income_time"]) ? strtotime($params["last_transfer_time"]) : "";
$pay_id = isset($params["pay_id"]) ? $params["pay_id"] : 0;
$source = $params["source"] ? $params["source"] : 0;
if($pay_id > 0){
......@@ -2886,7 +2887,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"],$params["last_transfer_time"],$pay_id);
$remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_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