ad

app/admin/controller/ComonOrder.php

@@ -40,7 +40,7 @@ class ComonOrder extends Base
     
     public function list(){
         $post = $this->request->only(["start"=>"","end"=>"","cxCode"=>"","customerNo"=>"","companyNo"=>"",'status'=>[],
-        'relaComNo'=>'','platform_type'=>'','inv_status'=>'','pay_status'=>'','page'=>1,'size'=>15],"post","trim");
+        'relaComNo'=>'','platform_type'=>'','inv_status'=>'','pay_status'=>'', 'page'=>1,'size'=>15],"post","trim");
         $where=[];
         $post['start']==''?:$where[]=["comon_order.addtime",">=",date("Y-m-d 00:00:00",strtotime($post['start']))];
         $post['end']==''?:$where[]=["comon_order.addtime","<=",date("Y-m-d 23:59:59",strtotime($post['end']))];
@@ -49,13 +49,11 @@ class ComonOrder extends Base
         empty($post['status'])?:$where[]=['comon_order.status','in',$post['status']];
         $post['inv_status']==''?:$where[]=["qrd.inv_status","=",$post['inv_status']];
         $post['pay_status']==''?:$where[]=["qrd.pay_status","=",$post['pay_status']];
-//        $post['status']==''?:$where[]=["comon_order.status","=",$post['status']];
         $post['platform_type']==''?:$where[]=["comon_order.platform_type","=",$post['platform_type']];
         $post['companyNo']==''?:$where[]=["comon_order.companyNo|comon_order.supplierNo","=",$post['companyNo']];
         $post['relaComNo']==''?:$where[]=["comon_order.companyNo|comon_order.supplierNo|comon_order.customerNo","=",
         $post['relaComNo']];
-        $list=$this->model->withJoin(["qrd","cgd"],"left")->where($where)->order("id desc")->paginate
-        (["page"=>$post['page'],"list_rows"=>$post['size']]);
+        $list=$this->model->withJoin(["qrd","cgd"],"left")->where($where)->order("id desc")->paginate (["page"=>$post['page'],"list_rows"=>$post['size']]);
         $this->success("0",["list"=>$list->items(),"count"=>$list->total()]);
     }
     //通用订单创建对账单

app/admin/controller/OrderPay.php

@@ -180,6 +180,9 @@ class OrderPay extends Base{
                                 Db::rollback();
                                 return error_show(1005,"销售单更新失败");
                             }
+                            if($update['status']==3){
+                            	(new \app\admin\model\ComonOrder())->where(["cxCode"=>$qrd['cxCode'],"status"=>-1])->update(["status"=>0]);
+                            }
                             $asscup =[
                                 "status"=>2,
                                 "assoc_time"=>date("Y-m-d H:i:s"),

app/admin/controller/Payment.php

@@ -565,7 +565,7 @@ class Payment extends Base
                      }
                 }
                Db::commit();
-                if(($status==3 || $status==4)&&$data['is_common']==1){
+                if(($status==3 || $status==4)&&$data['is_comon']==1){
                 	event("comonOrder",["payNo"=>$payNo,"type"=>"check"]);
                 }
                return app_show(0,"状态更新成功");
@@ -1054,6 +1054,9 @@ class Payment extends Base
         ->select()->toArray();
         foreach ($pay as &$value){
             $value['catInfo'] = json_decode($value['catInfo'],true);
+            if($payinfo['is_comon']==1){
+            	$value['qrdCode'] = (new \app\admin\model\ComonOrder())->where(['cgdNo'=>$value['sequenceNo']])->value("orderCode",'');
+            }
         }
         $payinfo['pay_type']=Db::name('supplier_info')->where('code',$payinfo['supplierNo'])->value('pay_method','');
         $tag =Db::name("tag_log")->alias("a")->leftJoin("order_tag b","a.tag_id=b.id")->where

app/admin/listener/ComonQrd.php

@@ -124,15 +124,20 @@ class ComonQrd
     	
     }
     public function CheckComonOrder($payinfo){
-        if($payinfo->inv_status==3 &&$payinfo->pay_status==3){
-            PayInfo::alias('a')->leftJoin('ComonOrder b','a.cgdNo=b.cgdNo')
-            ->where(['payNo'=>$payinfo->payNo,'is_del'=>0,'a.status'=>1])
-            ->update(["b.status"=>2]);
-        }
-        if($payinfo->inv_status==1 &&$payinfo->pay_status==1){
-            PayInfo::alias('a')->leftJoin('ComonOrder b','a.cgdNo=b.cgdNo')
-            ->where(['payNo'=>$payinfo->payNo,'is_del'=>0,'a.status'=>1])
-            ->update(['b.status'=>0]);
-        }
+    	if($payinfo->status==3||$payinfo->status==4 ){
+	        PayInfo::alias('a')->leftJoin('ComonOrder b','a.cgdNo=b.cgdNo')
+	            ->where(['payNo'=>$payinfo->payNo,'is_del'=>0,'a.status'=>0])
+	            ->update(['b.status'=>0]);
+    	}else{
+    		if($payinfo->inv_status==3 &&$payinfo->pay_status==3){
+	            PayInfo::alias('a')->leftJoin('ComonOrder b','a.cgdNo=b.cgdNo')
+	            ->where(['payNo'=>$payinfo->payNo,'is_del'=>0,'a.status'=>1])
+	            ->update(["b.status"=>2]);
+		        }elseif($payinfo->inv_status!=3|| $payinfo->pay_status!=3){
+		            PayInfo::alias('a')->leftJoin('ComonOrder b','a.cgdNo=b.cgdNo')
+		            ->where(['payNo'=>$payinfo->payNo,'is_del'=>0,'a.status'=>1])
+		            ->update(['b.status'=>1]);
+		        }
+    		}
     }
 }