我的成交详情

application/api_broker/service/OrderLogService.php

@@ -836,18 +836,19 @@ class OrderLogService
         $partialCommissionModel = new OPartialCommission();
 
         $field                          = "a.agent_id,a.role,b.name,b.phone,a.scale,a.should_commission,a.create_time,a.real_fee,a.charity_fund,
-                   a.cash,a.practical_fee";
+                   a.cash,a.practical_fee,a.service_charge";
         $commissionParams["bargain_id"] = $params["bargain_id"];
         $cent_commission_arr            = $partialCommissionModel->getCommissionListByBargainId($field, $commissionParams);
         //dump($cent_commission_arr);exit;
-        $cent_commission = array();
+        $cent_commission_ = $cent_commission = array();
         foreach ($cent_commission_arr as $k => $v) {
-            $cent_commission[$v['agent_id']][] = $v;
+            $cent_commission_[$v['agent_id']][] = $v;
         }
-        /* $z = 0;
+        $z = 0;
         foreach ($cent_commission_ as $item) {
             $cent_commission[$z]["agent_id"]          = $item[0]["agent_id"];
             $cent_commission[$z]["role"]              = $item[0]["role"];
+            $cent_commission[$z]["scale"]             = $item[0]["scale"];
             $cent_commission[$z]["name"]              = $item[0]["name"];
             $cent_commission[$z]["phone"]             = $item[0]["phone"];
             $cent_commission[$z]["should_commission"] = $item[0]["should_commission"];
@@ -859,16 +860,21 @@ class OrderLogService
                 $cent_commission[$z]["info"][$key]["charity_fund"]   = $j["charity_fund"];
                 $cent_commission[$z]["info"][$key]["cash"]           = $j["cash"];
                 $cent_commission[$z]["info"][$key]["practical_fee"]  = $j["practical_fee"];
+                $cent_commission[$z]["info"][$key]["service_charge"] = $j["service_charge"];
                 $key++;
             }
             $z++;
-         }*/
+        }
         $result["cent_commission"] = $cent_commission;
 
         //税费
         $taxesModel = new OTaxes();
-        $taxesModel->getBargainTaxes($params["bargain_id"]);
-        $taxes           = [];
+        $fieldTaxes = "bargain_id,fee,total_fee,father_id,operation_date,agent_id,agent_name,scale";
+        $taxes      = $taxesModel->getBargainTaxes($params["bargain_id"], $fieldTaxes);
+        foreach ($taxes as $items){
+            $taxes[$items["operation_date"]][] = $items;
+        }
+
         $result["taxes"] = $taxes;
 
         return $result;

application/model/OTaxes.php

@@ -25,6 +25,7 @@ class OTaxes extends BaseModel
     public function getBargainTaxes(int $bargain_id, $field = 'id as fee_id,fee,operation_date') {
         return $this->field($field)
             ->where('bargain_id', $bargain_id)
+            ->where('is_del', 0)
             ->select();
     }