Commit 31520849 authored by clone's avatar clone

bug

parent df0d2d3b
......@@ -816,8 +816,8 @@ class OrderLogService
$cent_commission["id"] = $item["id"];
$cent_commission["agent_id"] = $item["agent_id"];
$cent_commission["role"] = $item["role"];
$cent_commission["scale"] = $item["scale"];
$cent_commission["role"] = !empty($item["role"]) ? $item["role"] : $item["roles"];
$cent_commission["scale"] = !empty($item["scale"]) ? $item["scale"] : $item["scales"];
$cent_commission["name"] = $item["name"];
$cent_commission["phone"] = $item["phone"];
$cent_commission["should_commission"] = $item["should_commission"];
......@@ -880,7 +880,7 @@ class OrderLogService
//分佣提成 o_partial_commission
$field_commission = "a.id,a.agent_id,b.role,c.name,c.phone,b.scale,b.should_commission,b.confirm_date,b.create_time,b.real_fee,b.charity_fund,
$field_commission = "a.id,a.agent_id,a.role as roles,a.scale as scales,b.role,c.name,c.phone,b.scale,b.should_commission,b.confirm_date,b.create_time,b.real_fee,b.charity_fund,
b.cash,b.practical_fee,b.service_charge";
$cent_commission_arr = $bargainModel->selectBargainCommission($field_commission, [ "bargain_id" => $bargain_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