dd

app/admin/controller/OrderPay.php

@@ -263,6 +263,10 @@ class OrderPay extends BaseController{
         $status =isset($this->post['status'])&&$this->post['status']!==""? intval($this->post['status']):"";
         $tradNo =isset($this->post['tradNo'])&&$this->post['tradNo']!=""? trim($this->post['tradNo']):"";
         $companyNo =isset($this->post['companyNo'])&&$this->post['companyNo']!=""? trim($this->post['companyNo']):"";
+        $used_lower =isset($this->post['userd_lower'])&&$this->post['userd_lower']!==""? floor($this->post['userd_lower']) :"0";
+        $used_upper =isset($this->post['used_upper'])&&$this->post['used_upper']!==""? floor($this->post['used_upper']):"";
+        if($used_lower!=="")$condition[]=["used_fee",">=",$used_lower];
+        if($used_upper!=="")$condition[]=["used_fee","<=",$used_upper];
          if($companyNo!==""){
             $condition[]=["companyNo","=",$companyNo];
         }
@@ -372,7 +376,7 @@ class OrderPay extends BaseController{
            ->where($condition)
            ->page($page,$size)
            ->field("a.*,b.trade_bank,b.trade_account,b.trade_out,b.total_fee as btotal_fee,b.used_fee,b.balance,
-           d.orderCode,c.qrdSource,c.goodNo,c.goodName,c.qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName")
+           d.orderCode,c.qrdSource,c.goodNo,c.goodName,c.qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,c.totalPrice,d.cancel_fee")
            ->order("a.addtime desc")->select();
            return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
@@ -549,7 +553,7 @@ class OrderPay extends BaseController{
          $page = $page>$total ? intval($total):$page;
          $list=Db::name("trade_return")->alias("a")->leftJoin("assoc b","a.logNo=b.viceCode")
          ->leftJoin("qrd_info c","c.sequenceNo=b.orderCode")
-         ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName")
+         ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,b.cancel_fee,c.customerName")
          ->where($condition)->page($page,$size)->order("a.addtime desc")->select();
          return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }

app/admin/controller/Role.php

@@ -138,7 +138,7 @@ class Role extends BaseController{
      */
     public function roleInfo(){
         $post=$this->post;
-        $roleid= isset($post['roleid']) ? trim($post['roleid']) : "";
+        $roleid= isset($post['roleid']) ? intval($post['roleid']) : "";
         if($roleid==""){
             return error_show(1001,'roleid不能为空');
         }