财务开票模块更新

server/app/Finance/Services/Api/BaiwangApiService.php

@@ -206,6 +206,9 @@ class BaiwangApiService extends PlatformAbstractService
 
         $options['body'] = $this->requestParamsEncode($paramsBody);
 
+        var_dump($this->requestParamsEncode($paramsBody));
+        exit;
+
         list($url,$method) = explode($this->platformInfo['platform_url'],$uri);
         // auth签名
         $header = array_merge($header,$this->authHeaders($method));

server/app/Finance/Services/InvoiceService.php

@@ -223,10 +223,10 @@ class InvoiceService
                     'invoice_status' => 0
                 ]);
                 return true;
-            }else{
-                throw new \Exception('申请发票失败',502);
             }
         }
+
+        throw new \Exception('申请发票失败',502);
     }
 
     public function cancelBlueInvoice()
@@ -275,6 +275,36 @@ class InvoiceService
                 $saveParams['invoice_category'] = $invoiceParams['invoice_category'];
                 $saveParams['invoice_items'] = json_encode($invoiceParams['invoice_creater_by'],JSON_UNESCAPED_UNICODE);
                 $saveParams['invoice_customer'] = json_encode($invoiceParams['invoice_customer'],JSON_UNESCAPED_UNICODE);
+            }else{
+                $saveParams = current($invoiceInfo);
+
+                if(isset($invoiceParams['invoice_type']) && !empty($invoiceParams['invoice_type'])){
+                    $saveParams['invoice_type'] = $invoiceParams['invoice_type'] == 'blue' ? 1 : 2;
+                }
+                if(isset($invoiceParams['invoice_status']) && !empty($invoiceParams['invoice_status'])){
+                    $saveParams['invoice_status'] = $invoiceParams['invoice_status'];
+                }
+                if(isset($invoiceParams['invoice_money']) && !empty($invoiceParams['invoice_money'])){
+                    $saveParams['invoice_money'] = $invoiceParams['invoice_money'];
+                }
+                if(isset($invoiceParams['invoice_platform']) && !empty($invoiceParams['invoice_platform'])){
+                    $saveParams['invoice_platform'] = $invoiceParams['invoice_platform'];
+                }
+                if(isset($invoiceParams['platform_invoice_id']) && !empty($invoiceParams['platform_invoice_id'])){
+                    $saveParams['platform_invoice_id'] = $invoiceParams['platform_invoice_id'];
+                }
+                if(isset($invoiceParams['invoice_creater_by']) && !empty($invoiceParams['invoice_creater_by'])){
+                    $saveParams['invoice_creater_by'] = $invoiceParams['invoice_creater_by'];
+                }
+                if(isset($invoiceParams['invoice_category']) && !empty($invoiceParams['invoice_category'])){
+                    $saveParams['invoice_category'] = $invoiceParams['invoice_category'];
+                }
+                if(isset($invoiceParams['invoice_items']) && !empty($invoiceParams['invoice_items'])){
+                    $saveParams['invoice_items'] = $invoiceParams['invoice_items'];
+                }
+                if(isset($invoiceParams['invoice_customer']) && !empty($invoiceParams['invoice_customer'])){
+                    $saveParams['invoice_customer'] = $invoiceParams['invoice_customer'];
+                }
             }
 
             $result = $this->invoiceRecordRepository->saveInvoice($saveParams);
@@ -288,4 +318,12 @@ class InvoiceService
         }
     }
 
+    public function apiCallBack($params)
+    {
+        if(isset($params) && !empty($params)){
+            //现将返回的数据进行存储
+            $this->apiService->storePlatformDataEntries('invoice_callBack_',$params);
+        }
+    }
+
 }

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

@@ -31,7 +31,14 @@ class InvoiceController extends Controller
 
     public function baiwangInvoiceCallBack(Request $request)
     {
-
+        $requestContent = $request->getContent();
+        if(!empty($requestContent)){
+            $decodeContent = base64_decode($requestContent);
+            if($decodeContent){
+                $requestParams = $this->formatKeysfromArray(json_decode($decodeContent,true),'toUnderScore');
+                $result = $this->invoiceService->apiCallBack($requestParams);
+            }
+        }
     }
 
 }