Merge branch 'dev' into dev_wf

app/admin/command/GenerrateInvoice.php

@@ -73,9 +73,7 @@ class GenerrateInvoice extends Command
     }
 
     protected function GetAll(){
-        $data=Cache::pull("invoiceList");
         $list =Db::name("invoice_interface")->json(["DDMXXX"])->withoutField("id,status,is_check,result,remark,addtime,updatetime")->limit(1)->where(["status"=>0])->select();
-
         return $list;
     }
 

app/admin/controller/OrderInv.php

@@ -237,8 +237,14 @@ class OrderInv extends BaseController{
         $open_date =isset($this->post['open_date'])&&$this->post['open_date']!=''?trim($this->post['open_date']):"";
         $subtotal_fee =isset($this->post['subtotal_fee'])&&$this->post['subtotal_fee']!=''?floatval($this->post['subtotal_fee']):"";
         $checkCode =isset($this->post['checkCode'])&&$this->post['checkCode']!=''?trim($this->post['checkCode']):"";
+	     $update=[
+	            "status"=> $status,
+	            "exam_remark"=>$remark,
+	            "updatetime" => date("Y-m-d H:i:s")
+	            ];
         if($status==1){
            if($open_type==='')return error_show(1004,"参数 open_type 不能为空");
+            $update['open_type']=$open_type;
            if($open_type!=1){
                if($invCode==='') return error_show(1004,"参数 invCode 不能为空");
                if($invNum==='') return error_show(1004,"参数 invNum 不能为空");
@@ -252,12 +258,7 @@ class OrderInv extends BaseController{
            	    $status=7;
            }
         }
-        $update=[
-            "status"=> $status==2 && ($invinfo['inv_type']==3 || $invinfo['inv_type']==4) ? 3 : $status,
-            "exam_remark"=>$remark,
-            "updatetime" => date("Y-m-d H:i:s")
-            ];
-        $status==1 ? $update['open_type']=$open_type :"";
+		$update['status']=$status;
         Db::startTrans();
         try{
 

app/admin/controller/OrderPay.php

@@ -354,7 +354,8 @@ class OrderPay extends BaseController{
            	->leftJoin("qrd_info c","d.orderCode=c.sequenceNo")
            ->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")
+           ->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")
            ->order("a.addtime desc")->select();
            return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
@@ -514,7 +515,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")
+         ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName")
          ->where($condition)->page($page,$size)->order("a.addtime desc")->select();
          return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }

app/admin/controller/Payment.php

@@ -1033,8 +1033,8 @@ class Payment extends BaseController
     }
 
     /**
- * 发票审核状态
- *  0 上传发票，1待识别验证 2 待校验识别 3 待财务审核 4待认证 5认证成功待确认完成 6回票完成7识别失败 8 验证失败 9 财务驳回 10 认证失败 11校验超过次数第二天校验 12 回票申请废弃已结束
+	 * 发票审核状态
+	 *  0 上传发票，1待识别验证 2 待校验识别 3 待财务审核 4待认证 5认证成功待确认完成 6回票完成7识别失败 8 验证失败 9 财务驳回 10 认证失败 11校验超过次数第二天校验 12 回票申请废弃已结束
      * @return \think\response\Json|void
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
@@ -1077,7 +1077,7 @@ class Payment extends BaseController
             if($payment['invType']==1&&$status==1){
                 $status=2;
             }
-             if(in_array($payment['invoiceType'],['normal','electronic','toll','roll']) && $status==4){
+            if(in_array($payment['invoiceType'],['normal','electronic','toll','roll']) && $status==4){
                 $status=6; //普票无需认证
             }
             $invup =["status"=>$status,"remark"=>$remark,"updatetime"=>date("Y-m-d H:i:s")];

config/console.php

@@ -7,8 +7,8 @@ return [
     'commands' => [
     	"generrateinvoice"=>app\admin\command\GenerrateInvoice::class,
 		"getorderinfoandinvoiceinfo"=>app\admin\command\GetOrderInfoAndInvoiceInfo::class,
-        
-		'copyCxData'=>\app\command\copyCxData::class,//复制采销数据到中间表
-        'handleCxData'=>\app\command\handleCxData::class,//处理中间表的采销数据
+
+		'copyCxData'=>app\command\copyCxData::class,//复制采销数据到中间表
+        'handleCxData'=>app\command\handleCxData::class,//处理中间表的采销数据
     ],
 ];