a

app/admin/controller/OrderInv.php

@@ -1053,6 +1053,12 @@ class OrderInv extends BaseController{
         $poolinfop['goodList']=$orderList;
         $poolinfop['invinfo']=Db::name("invoice_ticket")->withoutField("pdfstream")->where(["invNo"=>$invNo,"type"=>0,"is_del"=>0])
         ->findOrEmpty();
+        $orderinfo = Db::name("assoc")->alias("a")->leftJoin("qrd_info c","a.orderCode=c.sequenceNo")
+           	->where(["a.viceCode"=>$invNo,"a.is_del"=>0,"a.status"=>[1,2]])
+           	->order("a.addtime desc")
+           	->field("a.orderCode,c.goodName,c.catInfo,c.goodUnit,c.tax,c.goodNum,c.goodPrice,c.totalPrice,a.cancel_fee")
+           	->findOrEmpty();
+        $poolinfop['orderinfo']=$orderinfo;
        return app_show(0,"获取成功",$poolinfo);
     }
     //退票列表

app/admin/controller/OrderPay.php

@@ -442,7 +442,7 @@ class OrderPay extends BaseController{
         $orderinfo = Db::name("assoc")->alias("a")->leftJoin("qrd_info c","a.orderCode=c.sequenceNo")
            	->where(["a.viceCode"=>$logNo,"a.is_del"=>0,"a.status"=>[1,2]])
            	->order("a.addtime desc")
-           	->field("c.*")
+           	->field("c.*,a.cancel_fee")
            	->findOrEmpty();
         $tradinfo['orderinfo']=$orderinfo;
         return app_show(0,"获取成功",$tradinfo);

app/admin/controller/Payment.php

@@ -669,7 +669,7 @@ class Payment extends BaseController
         if(empty($cgdNo))  return error_show(1004,"未找到对账采购单信息");
         $remark = isset($post['remark'])? trim($post['remark']) :"";
         $image = isset($post['return_image'])? trim($post['return_image']) :"";
-        $return_time = isset($post['return_time'])? trim($post['return_time']) :"";
+        $return_time = isset($post['return_time'])? trim($post['return_time']) :date("Y-m-d H:i:s");
         if($status==3){
             if($image=="")return error_show(1005,"付款回单图片不能为空");
             if($return_time=="")return error_show(1005,"付款回单时间不能为空");