bug

application/api_broker/controller/OrderLog.php

@@ -532,7 +532,7 @@ class OrderLog extends Basic
             $data['msg']  = 'Add the failure.';
         }
 
-        return $this->response($data['code'], $data['msg'], $data['data']);
+        return $this->response($data['code'], $data['msg'], []);
     }
 
     /**

application/model/OBargainModel.php

@@ -505,7 +505,7 @@ class OBargainModel extends Model
      */
     public function addBargainCommission($id, $submit_agent_id, $agent_id, $role, $scale_fee, $scale,$source) {
         $this->startTrans();
-        $bargain_data = $this->where('id', $id)->find()->lock(true);
+        $bargain_data = $this->where('id', $id)->find();
 
         if (empty($bargain_data['id'])) {
             $result = false;