Commit a868117b authored by clone's avatar clone

1

parent aea71009
...@@ -3830,7 +3830,7 @@ class Finance extends Basic ...@@ -3830,7 +3830,7 @@ class Finance extends Basic
$pay_data = []; $pay_data = [];
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,bargain_id,agent_id,'; $pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,bargain_id,agent_id,reckon_in_store,';
$pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type,received_money,type_ext,is_open,open_time'; $pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type,received_money,type_ext,is_open,open_time';
$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];
...@@ -3865,6 +3865,14 @@ class Finance extends Basic ...@@ -3865,6 +3865,14 @@ class Finance extends Basic
$pay_data['is_refund'] = 0; $pay_data['is_refund'] = 0;
} }
$pay_data['reckon_in_store_name'] = "";
if ($pay_data['reckon_in_store'] > 0) {
$agentModel = new AAgents();
$agentWhere_["b.id"] = $pay_data['reckon_in_store'];
$storeInfo = $agentModel->getAgentsStoreById($agentWhere_, "b.store_name");
$pay_data['reckon_in_store_name'] = $storeInfo['store_name'];
}
$m_report = new OReportModel(); $m_report = new OReportModel();
$pay_data['current_agent_name'] = $pay_data['store_name'] = ""; $pay_data['current_agent_name'] = $pay_data['store_name'] = "";
if (($pay_data['type'] == 92 || $pay_data['type'] == 91) && $pay_data['bargain_id'] > 0) { if (($pay_data['type'] == 92 || $pay_data['type'] == 91) && $pay_data['bargain_id'] > 0) {
......
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