Skip to content

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

type ext

parent 060666dc
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 13 deletions
application/api_broker/controller/OrderLog.php
View file @ 455c43c7
...@@ -179,8 +179,9 @@ class OrderLog extends Basic ...@@ -179,8 +179,9 @@ class OrderLog extends Basic
Log::record("********************transfer_img**". json_encode($transfer_img)); Log::record("********************transfer_img**". json_encode($transfer_img));
$source = isset($params["source"]) ? $params["source"] : 0; $source = isset($params["source"]) ? $params["source"] : 0;
$income_time = isset($params["income_time"]) ? $params["income_time"] : ""; $income_time = isset($params["income_time"]) ? $params["income_time"] : "";
$is_ok = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"], $received_money = isset($params["received_money"]) ? $params["received_money"] : "";
$params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source,$income_time); $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);
if ($is_ok > 0) { if ($is_ok > 0) {
return $this->response("200", "request success", [ "bill_id" => $is_ok ]); return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
...@@ -240,6 +241,7 @@ class OrderLog extends Basic ...@@ -240,6 +241,7 @@ class OrderLog extends Basic
$receipt_number = isset($params["receipt_number"]) ? $params["receipt_number"] : ""; $receipt_number = isset($params["receipt_number"]) ? $params["receipt_number"] : "";
$transfer_name = isset($params["transfer_name"]) ? $params["transfer_name"] : ""; $transfer_name = isset($params["transfer_name"]) ? $params["transfer_name"] : "";
$received_money = isset($params["transfer_name"]) ? $params["received_money"] : 0; $received_money = isset($params["transfer_name"]) ? $params["received_money"] : 0;
$type_ext = isset($params["type_ext"]) ? $params["type_ext"] : 0;
if($pay_id > 0){ if($pay_id > 0){
$source = 2; $source = 2;
} }
...@@ -247,7 +249,7 @@ class OrderLog extends Basic ...@@ -247,7 +249,7 @@ class OrderLog extends Basic
$is_ok = $this->service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"], $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"], $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"],$params["last_transfer_time"],$pay_id,
$receipt_number,$transfer_name, $received_money); $receipt_number,$transfer_name, $received_money, $type_ext);
if ($is_ok > 0) { if ($is_ok > 0) {
return $this->response("200", "request success", [ "bill_id" => $is_ok ]); return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
......
application/api_broker/service/OrderLogService.php
View file @ 455c43c7
...@@ -43,6 +43,7 @@ class OrderLogService ...@@ -43,6 +43,7 @@ class OrderLogService
/** /**
* 批量插入收款记录 * 批量插入收款记录
*
* @param $agent_id * @param $agent_id
* @param $agent_name * @param $agent_name
* @param $report_id * @param $report_id
...@@ -54,14 +55,17 @@ class OrderLogService ...@@ -54,14 +55,17 @@ class OrderLogService
* @param $remark * @param $remark
* @param $transfer_img * @param $transfer_img
* @param $source * @param $source
* @param $income_time
* @param $received_money
* @param $type_ext
* @return int|string * @return int|string
* @throws \think\Exception
* @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
* @throws \think\Exception
*/ */
public function addCollectingBillV2($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number, 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) $industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext)
{ {
$bill_arr = $params = []; $bill_arr = $params = [];
$father_id = 0; $father_id = 0;
...@@ -69,11 +73,11 @@ class OrderLogService ...@@ -69,11 +73,11 @@ class OrderLogService
if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) { if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
if ($father_id == 0) { if ($father_id == 0) {
$params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no, $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); $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext);
$father_id = $this->payLogModel->insertPayLog($params); $father_id = $this->payLogModel->insertPayLog($params);
} else { } else {
array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no, 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)); $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext));
} }
} }
} }
...@@ -94,6 +98,7 @@ class OrderLogService ...@@ -94,6 +98,7 @@ class OrderLogService
/** /**
* 批量插入收款记录 * 批量插入收款记录
*
* @param $agent_id * @param $agent_id
* @param $agent_name * @param $agent_name
* @param $report_id * @param $report_id
...@@ -111,6 +116,8 @@ class OrderLogService ...@@ -111,6 +116,8 @@ class OrderLogService
* @param $pay_id * @param $pay_id
* @param $receipt_number * @param $receipt_number
* @param $transfer_name * @param $transfer_name
* @param $received_money
* @param $type_ext
* @return int|string * @return int|string
* @throws \think\Exception * @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
...@@ -119,7 +126,7 @@ class OrderLogService ...@@ -119,7 +126,7 @@ class OrderLogService
*/ */
public function addCollectingBill($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number, 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, $industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend,
$last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money) $last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money, $type_ext)
{ {
$bill_arr = $params = []; $bill_arr = $params = [];
$father_id = 0; $father_id = 0;
...@@ -141,12 +148,12 @@ class OrderLogService ...@@ -141,12 +148,12 @@ class OrderLogService
if ($father_id == 0) { if ($father_id == 0) {
$params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $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, $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); $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext);
$father_id = $this->payLogModel->insertPayLog($params); $father_id = $this->payLogModel->insertPayLog($params);
} else { } else {
array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, 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, $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)); $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext));
} }
} }
} }
...@@ -279,7 +286,7 @@ class OrderLogService ...@@ -279,7 +286,7 @@ class OrderLogService
*/ */
private function collectingBillBin($father_id, $collecting_arr, $agent_id, $agent_name, $report_id, $order_id, 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, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
$income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money) $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext)
{ {
$arr["report_id"] = $report_id; $arr["report_id"] = $report_id;
...@@ -302,6 +309,7 @@ class OrderLogService ...@@ -302,6 +309,7 @@ class OrderLogService
$arr["update_time"] = date("Y-m-d H:i:s", time()); $arr["update_time"] = date("Y-m-d H:i:s", time());
$arr["is_dividend"] = $is_dividend; $arr["is_dividend"] = $is_dividend;
$arr["received_money"] = $received_money; $arr["received_money"] = $received_money;
$arr["type_ext"] = $type_ext;
if ($income_time) { if ($income_time) {
$arr["income_time"] = date("Y-m-d H:i:s", $income_time); $arr["income_time"] = date("Y-m-d H:i:s", $income_time);
} }
......
application/index/controller/Finance.php
View file @ 455c43c7
...@@ -2889,7 +2889,7 @@ class Finance extends Basic ...@@ -2889,7 +2889,7 @@ class Finance extends Basic
try { try {
$m_pay = new OPayLogModel(); $m_pay = new OPayLogModel();
$pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,'; $pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,';
$pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type,received_money'; $pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type,received_money,type_ext';
$pay_data = $m_pay->selectReceiptImgList($pay_fields, ['id'=>$this->params['pay_id']]); $pay_data = $m_pay->selectReceiptImgList($pay_fields, ['id'=>$this->params['pay_id']]);
$pay_data = $pay_data[0]; $pay_data = $pay_data[0];
//成交报告id //成交报告id
...@@ -3059,13 +3059,14 @@ class Finance extends Basic ...@@ -3059,13 +3059,14 @@ class Finance extends Basic
$receipt_number = isset($params["receipt_number"]) ? $params["receipt_number"] : ""; $receipt_number = isset($params["receipt_number"]) ? $params["receipt_number"] : "";
$transfer_name = isset($params["transfer_name"]) ? $params["transfer_name"] : ""; $transfer_name = isset($params["transfer_name"]) ? $params["transfer_name"] : "";
$received_money = isset($params["received_money"]) ? $params["received_money"] : 0; $received_money = isset($params["received_money"]) ? $params["received_money"] : 0;
$type_ext = isset($params["type_ext"]) ? $params["type_ext"] : 0;
if($pay_id > 0){ if($pay_id > 0){
$source = 2; $source = 2;
} }
$service_ = new OrderLogService(); $service_ = new OrderLogService();
$is_ok = $service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"], $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"], $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); $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id, $receipt_number,$transfer_name, $received_money, $type_ext);
if ($is_ok > 0) { if ($is_ok > 0) {
return $this->response("200", "request success", [ "bill_id" => $is_ok ]); 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