ad

app/admin/controller/InvoiceItem.php

@@ -266,4 +266,8 @@ class InvoiceItem extends Base{
         $orderItemModel->commit();
         $this->success("导入成功");
     }
+
+    public function exportItem(){
+        $param=$this->request->param([ "order_type"=>"","list"=>[]],"post","trim");
+    }
 }

app/admin/controller/OrderPay.php

@@ -610,13 +610,13 @@ class OrderPay extends Base{
             $condition[]=["a.status","=",$status];
         }
          $count =Db::name("trade_return")->alias("a")
-         ->leftJoin("assoc b","a.logNo=b.viceCode")
-         ->leftJoin("qrd_info c","c.sequenceNo=b.orderCode")
+         ->leftJoin("assoc b","a.logNo=b.viceCode and b.type=2")
+         ->leftJoin("qrd_info c","c.sequenceNo=b.orderCode and c.is_del=0")
          ->where($condition)->count();
          $total=ceil($count/$size);
          $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")
+         $list=Db::name("trade_return")->alias("a")->leftJoin("assoc b","a.logNo=b.viceCode and b.type=2")
+         ->leftJoin("qrd_info c","c.sequenceNo=b.orderCode  and c.is_del=0")
          ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,b.cancel_fee,c.customerName,c.customerNo")
          ->where($condition)->page($page,$size)->order("a.addtime desc")->select();
          return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);

app/admin/controller/Payment.php

@@ -1501,10 +1501,10 @@ class Payment extends Base
             $save=$info->save($invup);
             if($save){
                 if($param['status']==4){
-                    Pay::addAinv($param['hpNo'],$info->inv_fee);
+                    Pay::addAinv($info['payNo'],$info->inv_fee);
                 }
                 if(in_array($param['status'],[5,6,7])){
-                    Pay::subInv($param['hpNo'],$info->inv_fee);
+                    Pay::subInv($info['payNo'],$info->inv_fee);
                     event("reportCode",["param"=>["key"=>"hpNo","value"=>$param['hpNo']],"type"=>"sub"]);
                 }
             }else throw new \Exception("回票审核失败");