Commit 814f1ecc authored by clone's avatar clone

1

parent e2080fc8
......@@ -4502,11 +4502,19 @@ class Finance extends Basic
}
$m_pay_adjustment = new OPayLogAdjustment();
$adjustment_data = $m_pay_adjustment->getAdjustmentList('id,new_paylog_id,paylog_id,money,type', ['id' => $this->params['id']]);
$adjustment_data = $m_pay_adjustment->getAdjustmentList('id,new_paylog_id,paylog_id,money,type,reckon_in_store_id', ['id' => $this->params['id']]);
if (empty($adjustment_data[0]['id'])) {
return $this->response($code, '没有该调整详情');
}
$adjustment_data[0]['reckon_in_store_name'] = "";
if ($adjustment_data[0]['reckon_in_store'] > 0) {
$agentModel = new AAgents();
$agentWhere_["b.id"] = $adjustment_data[0]['reckon_in_store'];
$storeInfo = $agentModel->getAgentsStoreById($agentWhere_, "b.store_name");
$adjustment_data[0]['reckon_in_store_name'] = $storeInfo['store_name'];
}
$m_pay = new OPayLogModel();
$result['adjustment'] = $m_pay->getOrderHouse('a.id,a.order_id,b.house_id,c.internal_address,a.income_time,a.type,a.pay_type,a.money,a.bargain_id', ['a.id' => $adjustment_data[0]['new_paylog_id']]);
$result['adjustment_old'] = $m_pay->getOrderHouse('a.id,a.order_id,a.agent_id,a.agent_name,a.create_time,b.house_id,c.internal_address,a.income_time,a.type,a.pay_type,a.type', ['a.id' => $adjustment_data[0]['paylog_id']]);
......
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