ad

app/admin/command/CheckTicket.php

@@ -25,17 +25,18 @@ class CheckTicket extends Command
     protected function execute(Input $input, Output $output)
     {
         $this->dateTime = date("Y-m-d H:i:s");
-        if(Cache::get('checkTicketP')==1)return;
+     #   if(Cache::get('checkTicketP')==1)return;
         $ticket = $this->getTicket();
         while ($ticket->valid()) {
             Cache::set('checkTicketP',1,1800);
             $data = $ticket->current();
+            echo  $data['invNo']."\r\n";
             $this->checkTicket($data);
             $ticket->next();
         }
         Cache::set('checkTicketP',0);
         // 指令输出
-        $output->writeln('checkticket');
+     //   $output->writeln('checkticket');
     }
     protected function getTicket(){
         $ticket = InvoiceTicket::where([["is_del","=",0],["type","=",0],["status","=",0],['updatetime','<',date('Y-m-d H:i:s')]])
@@ -73,7 +74,7 @@ class CheckTicket extends Command
             if($result['data']['cyjg']=='0001'){
                 $data= $result['data'];
                 $this->changeFiled($data,$info);
-            }elseif (in_array($result['data']['cyjg'],['0002','1014',"006"])){
+            }elseif (in_array($result['data']['cyjg'],['0002','1014'])){
                 $this->lastUpdate($info['invNo']);
             }else $this->faild($invoice['id'],$result['data']['cyjgxx']);
         }else $this->faild($info['invNo']);

app/admin/listener/ComonQrd.php

@@ -12,7 +12,7 @@ use app\admin\model\Pay;
 use app\admin\model\PayInfo;
 use app\admin\model\PayInvoice;
 use app\admin\model\QrdInfo;
-use app\admin\model\TagLog;use think\facade\Db;
+use app\admin\model\TagLog;use think\facade\Db;use think\helper\Str;
 class ComonQrd
 {
     /**
@@ -267,7 +267,7 @@ class ComonQrd
     	if($payinfo->isEmpty()) return;
     	if($payinfo->is_comon!=1)return;
     	if(!in_array($payinfo->status,[1,2]))return;
-    	$ticket =InvoiceTicket::where(["invNo"=>$data['invNo'],"type"=>0])->json(['item'])->findOrEmpty();
+    	$ticket =InvoiceTicket::where(["invNo"=>$data['invNo'],"type"=>0])->findOrEmpty();
     	if($ticket->isEmpty())return;
     	$pay_fee=0;
     	if($payinfo->winv_fee >=$invinfo->inv_value){
@@ -312,7 +312,7 @@ class ComonQrd
     	    		    $temp['unit_price']=$item['DJ'];
     	    		    $temp['amount']=$item['JE'];
     	    		    $temp['tax']=$item['SE'];
-    	    		    $temp['tax_rate']=strval($item['SL']*100)."%";
+    	    		    $temp['tax_rate']= Str::contains($item['SL'],"%")?$item['SL']:strval($item['SL']*100)."%" ;
     				    $itemArr[]=$temp;
     			    }
     	}

app/admin/model/InvoiceTicket.php

@@ -16,27 +16,5 @@ class InvoiceTicket extends Model
     public function setItemAttr($v){
       return json_encode($v,JSON_UNESCAPED_UNICODE);
     }
-   public static function onAfterUpdate(Model $model){
-       log::info("InvoiceTicket::OnAfterUpdate");
-       Log::info('InvoiceTicket::OnAfterUpdate'.json_encode($model->toArray(),JSON_UNESCAPED_UNICODE));
-       if($model->status==1 && $model['type']==0 && $model->is_del==0 && !empty($model->item)){
-          (new  InvoiceItem)->saveAll(array_map(function ($item)use($model) {
-              return [
-                  'invoiceCode'=>$model->invNo,
-                  'order_type'=>1,
-                  'good_name'=>$item['XMMC'],
-                  'unit'=>$item['DW'],
-                  'num'=>$item['SPSL'],
-                  'unit_price'=>$item['DJ'],
-                  'amount'=>$item['JE'],
-                  "tax_amount"=>$item['SE'],
-                  "tax"=>$item['SL'],
-                  "cat_code"=>$item['SPBM'],
-                  "total_amount"=>bcadd($item['JE'],$item['SE'],2),
-                  "balance_amount"=>bcadd($item['JE'],$item['SE'],2),
-              ];
-          },$model->item));
-         log::info('InvoiceTicket::OnAfterUpdate'.(new  InvoiceItem)->getLastSql());
-       }
-   }
+
 }