Commit 0f270581 authored by clone's avatar clone

bug

parent fc18e3b2
......@@ -532,7 +532,7 @@ class OrderLog extends Basic
header('Access-Control-Allow-Origin:*');
$params = $this->params;
/* $params = array(
"bargain_id" => 469,
"bargain_id" => 705,
);*/
if (!isset($params["bargain_id"])) {
return $this->response("101", "请求参数错误");
......
......@@ -1191,7 +1191,7 @@ class OrderLogService
$bargainModel = new OBargainModel();
$bargain_info_filed = "a.id,a.house_number,a.account_time,a.account_statement,a.father_id,a.is_open,a.trade_type,
a.price,a.industry_type,a.estimated_receipt_date,a.commission,c.id,c.internal_title,c.internal_address,d.user_id,d.user_phone,d.user_name";
a.price,a.industry_type,a.estimated_receipt_date,a.commission,c.id as house_id,c.internal_title,c.internal_address,d.user_id,d.user_phone,d.user_name";
$result = [];
$bargainInfo = $bargainModel->selectBargainDetail($bargain_info_filed, $params);
......@@ -1214,6 +1214,7 @@ class OrderLogService
b.cash,b.practical_fee,b.service_charge";
$cent_commission_arr = $bargainModel->selectBargainCommission($field_commission, [ "bargain_id" => $bargain_id ]);
//dump($cent_commission_arr);
$cent_commissions = [];
$result["cent_commission"] = $this->recursion($cent_commission_arr, $cent_commissions, 0);
......
......@@ -288,7 +288,7 @@ class OBargainModel extends Model
->whereOr($whereOr_)
->order("a.id asc")
->select();
//echo $this->getLastSql();
// echo $this->getLastSql();
return $result;
}
......
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