bug

application/api_broker/controller/OrderLog.php

@@ -425,9 +425,9 @@ class OrderLog extends Basic
     {
         header('Access-Control-Allow-Origin:*');
         $params = $this->params;
-//           $params = array(
-//                 "bargain_id" => 169,
-//             );
+          /* $params = array(
+                 "bargain_id" => 469,
+             );*/
         if (!isset($params["bargain_id"])) {
             return $this->response("101", "请求参数错误");
         }

application/api_broker/service/OrderLogService.php

@@ -836,7 +836,7 @@ class OrderLogService
         //分佣提成 o_partial_commission
         $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,
+        $field                          = "a.agent_id,a.role,b.name,b.phone,a.scale,a.should_commission,a.confirm_date,a.create_time,a.real_fee,a.charity_fund,
                    a.cash,a.practical_fee,a.service_charge";
         $commissionParams["bargain_id"] = $params["bargain_id"];
         $cent_commission_arr            = $partialCommissionModel->getCommissionListByBargainId($field, $commissionParams);
@@ -859,6 +859,7 @@ class OrderLogService
                 foreach ($item as $i => $j) {
                     $cent_commission[$z]["info"][$key]["real_fee"]       = $j["real_fee"];
                     $cent_commission[$z]["info"][$key]["create_time"]    = $j["create_time"];
+                    $cent_commission[$z]["info"][$key]["confirm_date"]   = $j["confirm_date"];
                     $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"];

application/model/OTaxes.php

@@ -24,8 +24,10 @@ class OTaxes extends BaseModel
      */
     public function getBargainTaxes(int $bargain_id, $field = 'id as fee_id,fee,operation_date')
     {
+        $params["bargain_id"] = $bargain_id;
+        $params["father_id"] = array("neq",0);
         return $this->field($field)
-            ->where('bargain_id', $bargain_id)
+            ->where($params)
             ->where('is_del', 0)
             ->select();
     }