Merge remote-tracking branch 'origin/wx0604' into wx0604

application/api_broker/service/OrderLogService.php

@@ -814,9 +814,10 @@ class OrderLogService
             $item     = $params[0];
             $agent_id = $params[0]["agent_id"];
 
+            $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"];
@@ -833,7 +834,10 @@ class OrderLogService
                     $arr["cash"]                   = $value["cash"];
                     $arr["practical_fee"]          = $value["practical_fee"];
                     $arr["service_charge"]         = $value["service_charge"];
-                    $cent_commission["info"][$key] = $arr;
+                    if(!empty($value["real_fee"]) && !empty($value["create_time"])){ //过滤掉空的
+                        $cent_commission["info"][$key] = $arr;
+                    }
+
 
                     $key++;
                     unset($params[$j]);
@@ -879,7 +883,7 @@ class OrderLogService
 
 
         //分佣提成 o_partial_commission
-        $field_commission = "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 ]);