From 523794ba1eb5d8e99fd3b2b8e775a200a6ab7f4a Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Wed, 22 Jan 2025 14:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=8E=B7=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Test.php                |  5 +++++
 app/service/invoice/TempInvoiceService.php | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/controller/api/Test.php b/app/controller/api/Test.php
index 7d6e51f..47f2700 100644
--- a/app/controller/api/Test.php
+++ b/app/controller/api/Test.php
@@ -44,6 +44,11 @@ class Test extends Base
     {
         try {
             $param = $this->request->param();
+            validate()->rule([
+                'pucode|用户编号' => 'require|number|max:10',
+                'expire_time|开票日期' => 'require|number|max:11',
+                'id|编号' => 'require|number|max:11'
+            ])->check($param);
             $data = (new \app\service\invoice\TempInvoiceService())->IssueAnInvoice($param);
             return $this->buildSuccess($data);
         } catch (\Exception $e) {
diff --git a/app/service/invoice/TempInvoiceService.php b/app/service/invoice/TempInvoiceService.php
index 41d1711..8373eda 100644
--- a/app/service/invoice/TempInvoiceService.php
+++ b/app/service/invoice/TempInvoiceService.php
@@ -89,22 +89,23 @@ class TempInvoiceService
 
                 // 拼接pdf
                 // 盖章
-                $requestData = ['data' => $data, 'meta' => $meta];
-                $deCompress  = $InvoiceIssuanceService->deCompress($requestData);
-                if ($deCompress['status'] != 200) {
-                    throw new FuncException('pdf数据解密失败');
-                }
-                if (!isset($deCompress['data']['pdfdata'])) {
-                    throw new FuncException('pdf文件合并失败');
-                }
-                $pdfFilepath = $deCompress['data']['pdfdata'];//$this->savePdfFile($deCompress['data']['pdfdata']);
+//                $requestData = ['data' => $data, 'meta' => $meta];
+//                $deCompress  = $InvoiceIssuanceService->deCompress($requestData);
+//                if ($deCompress['status'] != 200) {
+//                    throw new FuncException('pdf数据解密失败');
+//                }
+//                if (!isset($deCompress['data']['pdfdata'])) {
+//                    throw new FuncException('pdf文件合并失败');
+//                }
+//                $pdfFilepath = $deCompress['data']['pdfdata'];//$this->savePdfFile($deCompress['data']['pdfdata']);
 
                 $returnData['i_i_d_data'] = [
                     'i_i_id' => $invoiceIssuance['id'],
                     'bdznsrsbh' => $bdznsrsbh,
                     'jsyj' => $jsyj,
                     'assetID' => $assetID,
-                    'pdfFilepath' => $pdfFilepath,
+                    'pdf_data' => $data,
+                    'pdf_meta' => $meta
                 ];
 
                 $returnData['i_i_data'] = [