退款审核

application/index/controller/Finance.php

@@ -180,10 +180,7 @@ class Finance extends Basic
         } else {
             $bargain = new OBargainModel();
             $fields = 'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.commission,a.practical_fee';
-            $where['a.father_id']    = 0;
-            $where['c.is_del']       = 0;
-//            $where['a.check_status'] = 0;
-            $where['a.status'] = 10;
+            $where['a.id'] = $this->params['id'];
             $data['data'] = $bargain->getBargainInfo($fields, $where);
         }
 
@@ -330,6 +327,9 @@ class Finance extends Basic
      * 收款记录
      *
      * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function payLogList() {
         $data['code'] = 200;
@@ -355,7 +355,11 @@ class Finance extends Basic
 
     /**
      * 报备时间轴
+     *
      * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function selectReportAll()
     {
@@ -459,7 +463,7 @@ class Finance extends Basic
         $where['a.status'] = 1;
         $refund = new ORefundModel();
 
-        $fields = 'a.id,a.agent_name,a.name,a.bank,a.card_no,a.create_time,a.refund_money,b.report_agent_name,b.user_name,b.order_id';
+        $fields = 'a.id,a.agent_name,a.name,a.bank,a.card_no,a.create_time,a.refund_money,b.report_agent_name,b.user_name,a.order_id';
         $data['data']['list']  = $refund->getCheckRefundList($pageNo, $pageSize, 'a.id DESC', $fields, $where);
         $data['data']['total'] = $refund->getCheckRefundListTotal($where);
 

application/model/OBargainModel.php

@@ -73,12 +73,13 @@ class OBargainModel extends Model
      *
      * @param $filed
      * @param $params
+     * @param string $order
      * @return false|\PDOStatement|string|\think\Collection
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function selectBargainByOrderNo($filed, $params)
+    public function selectBargainByOrderNo($filed, $params, $order = 'id desc')
     {
         $where_ = [];
         if (isset($params["report_id"])) {
@@ -97,6 +98,7 @@ class OBargainModel extends Model
         return $this->db_
             ->field($filed)
             ->where($where_)
+            ->order($order)
             ->select();
     }