各种方

application/api_broker/service/OfficeOrderLogService.php

@@ -1504,22 +1504,22 @@ class OfficeOrderLogService
     public function searchBargainAllAgents($order_id)
     {
         $orderModel         = new OfficeOrderModel();
-        $field              = "a.id,a.order_no,a.house_id,a.house_title,b.id as report_id,b.user_id,c.user_nick,c.user_phone,
+        $fields              = "a.id,a.order_no,a.house_id,a.house_title,b.id as report_id,b.user_id,c.user_nick,c.user_phone,
         c.user_pic,c.sex";
         $where_["order_id"] = $order_id;
-        $result             = $orderModel->selectOrderDetail($field, $where_);
+        $result             = $orderModel->selectOrderDetail($fields, $where_);
 
         if (count($result) <= 0 || $result[0]["house_id"] <= 0 || $result[0]["user_id"] <= 0) {
             return null;
         }
 
         $houseAgents               = new OfficeGRoomToAgent();
-        $fields                    = "b.id,b.phone,b.name,a.type";
+        $field                    = "b.id,b.phone,b.name";
         $where_house["a.house_id"] = $result[0]["house_id"];
         $where_house["a.type"]     = ['in', '2,3'];
         $where_house["a.is_del"]   = 0;
         $where_house["b.status"]   = 0;
-        $agent_house               = $houseAgents->getAgentsByHouseId($fields, $where_house);
+        $agent_house               = $houseAgents->getAgentsByHouseId($fields.',a.type', $where_house);
 
         $list = [];
         $key  = 0;

application/index/controller/OfficeBargain.php

@@ -561,17 +561,17 @@ class OfficeBargain extends Basic
             return $this->response("101", "请求参数错误");
         }
 
-        try {
+//        try {
             $order_service = new OfficeOrderLogService();
             $list          = $order_service->searchBargainAllAgents($params["order_id"]);
-            if (count($list) > 0) {
-                return $this->response("200", "request success", $list);
-            } else {
-                return $this->response("200", "request null");
-            }
-        } catch (\Exception $e) {
-            return $this->response("101", "request error,msg:" . $e);
-        }
+//            if (count($list) > 0) {
+//                return $this->response("200", "request success", $list);
+//            } else {
+//                return $this->response("200", "request null");
+//            }
+//        } catch (\Exception $e) {
+//            return $this->response("101", "request error,msg:" . $e);
+//        }
     }
 
     /**

application/index/controller/OfficePayLog.php

@@ -1939,10 +1939,6 @@ class OfficePayLog extends Basic
         $data['code'] = 200;
         $data['msg']  = "";
         $data['data'] = [];
-
-        $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
-        $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
-
         $refund  = new OfficeORefundModel();
         $m_house = new OfficeGRoom();
         $m_store = new AStore();

application/route.php

@@ -1083,7 +1083,8 @@ Route::group('office_index', [
     'getPayLogData'                   => ['index/officePayLog/getPayLogData', ['method' => 'GET']], //收款各种详情
     'adjustmentList'                  => ['index/officePayLog/adjustmentList', ['method' => 'GET']], //调整列表
     'refundDetail'                    => ['index/officePayLog/refundDetail', ['method' => 'GET']], //退款详情
-    'checkRefund'                     => ['index/officePayLog/checkRefund', ['method' => 'GET']], //退款审核
+    'checkRefund'                     => ['index/officePayLog/checkRefund', ['method' => 'POST']], //退款审核
+    'refundListExcel'                 => ['index/officePayLog/refundListExcel', ['method' => 'get']], //退款列表-导出excel
     'delRefund'                       => ['index/officePayLog/delRefund', ['method' => 'POST']], //删除退款
     'refundList'                      => ['index/officePayLog/refundList', ['method' => 'get']], //退款列表-专员审核
     'reportListUndone/:check_status'  => ['index/OfficeBargain/reportList', ['method' => 'get'], ['check_status' => 6]], //财务 成交报告-已撤销