财务开票模块更新

server/app/Console/Commands/InvoiceJobCommand.php

@@ -87,6 +87,9 @@ class InvoiceJobCommand extends Command
                         'invoice_platform' => 'rhawn',
                     ]);
                     break;
+                case 'tryAgainInvoiceApiResult' :
+                    $service->tryAgainInvoiceApiResult();
+                    break;
                 case 'applyInvoice' :
                     $service->applyInvoice([
                         'invoice_platform' => 'rhawn',

server/app/Finance/Repositories/Eloquent/InvoiceRecordRepositoryEloquent.php

@@ -57,4 +57,9 @@ class InvoiceRecordRepositoryEloquent extends BaseRepository implements InvoiceR
         ]);
     }
 
+    public function getNotResultInvoiceRecord()
+    {
+        return $this->getList(['invoice_status' => '-1']);
+    }
+
 }

server/app/Finance/Services/InvoiceService.php

@@ -434,6 +434,46 @@ class InvoiceService
         }
     }
 
+    public function tryAgainInvoiceApiResult()
+    {
+        $result = $this->invoiceRecordRepository->getNotResultInvoiceRecord();
+        if($result){
+           foreach($result as $res){
+               $invoiceResponse = $this->queryInvoiceInfo([
+                   'invoice_platform' => $res['invoice_platform'],
+                   'invoice_number' => $res['invoice_number']
+               ]);
+               if(!$invoiceResponse){
+                   continue;
+               }
+               if(in_array($invoiceResponse['status'],[0,1])){
+                   $status = null;
+                   switch($invoiceResponse['status']){
+                       case 0 : $status = '待审核';break;
+                       case 1 : $status = '开票中';break;
+                   }
+                   SimpleLogs::writeLog('当前票据 ['.$res['invoice_number'].'] 状态为 : '.$status, __CLASS__.':'.__FUNCTION__);
+                   continue;
+               }
+               $params = [];
+               $params['ddlsh'] = $res['invoice_number'];
+               $params['status'] = $invoiceResponse['status'];
+               switch($invoiceResponse['status']){
+                   case 2 : $params['ycyy'] = '';break;
+                   case 3 : $params['ycyy'] = $invoiceResponse['ycyy'];break;
+               }
+               $this->apiService->storePlatformDataEntries('invoice_callBack_'.$res['invoice_number'].'_applyInvoice',$params);
+               $queueParams = ['params' => $params,'type' => 'applyInvoiceCallBack'];
+               //塞入队列
+               $this->apiService->pushQueue([
+                   'params' => $queueParams,
+                   'consumer' => __CLASS__,
+                   'method' => 'invoiceApiCallBack'
+               ],'invoiceCallBack');
+           }
+        }
+    }
+
     public function invoiceApiCallBack($params)
     {
         if(empty($params)){