财务开票模块更新

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

@@ -50,4 +50,11 @@ class InvoiceRecordRepositoryEloquent extends BaseRepository implements InvoiceR
         return $result;
     }
 
+    public function delInvoiceByNumber($invoiceNumber)
+    {
+        return $this->deleteWhere([
+            'invoice_number' => $invoiceNumber
+        ]);
+    }
+
 }

server/app/Finance/Services/InvoiceService.php

@@ -512,6 +512,7 @@ class InvoiceService
                 }
                 else{
                     $updateInvoice['invoice_status'] = 2;
+                    $updateInvoice['api_response'] = $callBackParams['ycyy'];
                     $updatedInvoiceResult = $this->invoiceRecordRepository->saveInvoice($updateInvoice);
                     if($updatedInvoiceResult) {
                         switch($updatedInvoiceResult['invoice_platform']){
@@ -803,4 +804,25 @@ class InvoiceService
    }
 
 
+   public function delInvoiceRecord($requestParams)
+   {
+       if(!isset($requestParams['invoice_number']) || empty($requestParams['invoice_number'])){
+           throw new \Exception('发票流水号为空',502);
+       }
+
+       $invoiceResult = $this->invoiceRecordRepository->getInvoiceRecordByNumber($requestParams);
+       if(!$invoiceResult){
+           throw new \Exception('该发票流水号不存在',502);
+       }
+       $invoiceResult = current($invoiceResult);
+
+       $result = $this->invoiceRecordRepository->delInvoiceByNumber($invoiceResult['invoice_number']);
+       if($result){
+           $this->apiService->removePlatformDataEntries('invoice_apply_'.$invoiceResult['invoice_number']);
+       }
+
+       return true;
+   }
+
+
 }

server/app/Http/Controllers/V1/Finance/Front/InvoiceController.php

@@ -60,4 +60,20 @@ class InvoiceController extends Controller
             return $this->returnErrorExecptionResponse($exception,$exception->getMessage());
         }
     }
+
+    public function delInvoice(Request $request)
+    {
+        $message = [
+            'invoiceNumber.required' => "发票流水号不能为空",
+        ];
+        $this->validateRequest($request, $message);
+
+        $requestParams = $this->formatKeysfromArray($request->all(),'toUnderScore');
+        try{
+            $result = $this->invoiceService->delInvoiceRecord($requestParams['invoice_number']);
+            return Response::success($result,'重置请求成功');
+        }catch(\Throwable $exception){
+            return $this->returnErrorExecptionResponse($exception,$exception->getMessage());
+        }
+    }
 }

server/routes/api/finance.php

@@ -26,6 +26,8 @@ $api->version('v1', function($api) {
     $api->group(['namespace'=>'App\Http\Controllers\V1\Finance\Front','middleware' => ['throttle:60,1','apiAuth'], 'providers' => 'jwt'], function($api) {
         $api->post('/finance/invoice/getInvoiceRecordList', ['permission' => 'finance.getInvoiceRecordList', 'uses'=>'InvoiceController@getInvoiceRecordList']);
         $api->post('/finance/invoice/getInvoiceStatusDetail', ['permission' => 'finance.getInvoiceStatusDetail', 'uses'=>'InvoiceController@getInvoiceStatusDetail']);
+        $api->post('/finance/invoice/invoiceRequestReset', ['permission' => 'finance.invoiceRequestReset', 'uses'=>'InvoiceController@invoiceRequestReset']);
+        $api->post('/finance/invoice/delInvoice', ['permission' => 'finance.delInvoice', 'uses'=>'InvoiceController@delInvoice']);
     });
 
 });