结报统计接口优化

app/controller/api/InvoiceIssuance.php

@@ -7,7 +7,6 @@ use app\model\InvoiceIssuance as InvoiceIssuanceModel;
 use app\model\InvoiceIssuanceData;
 use app\model\WechatPucode;
 use app\service\invoice\InvoiceIssuanceService;
-use app\service\webService\FeeService;
 use app\util\ReturnCode;
 use app\validate\InvoiceHeadValidate;
 use app\validate\InvoiceIssuanceValidate;
@@ -130,13 +129,17 @@ class InvoiceIssuance extends Base
         try {
             $wechat_user_id = $this->request->wechat_user_id;
 
+            $field = 'type, title, tax_number';
+            $where = [
+                ['wechat_user_id', '=', $wechat_user_id],
+                ['tax_number', '<>', ''],
+            ];
+            $data = (new InvoiceHead())->where($where)->field($field)->order('id', 'DESC')->find();
+            if (!$data) {
                 $pucode = (new WechatPucode())->where('wechat_user_id', $wechat_user_id)->value('pucode');
 
-            $FeeService = new FeeService($pucode);
+                $feeUserInfo = (new InvoiceIssuanceService())->getFeeUserData($pucode);
-            $feeUserInfo = $FeeService->getUsers();
+
-            if (!$feeUserInfo) {
-                throw new \Exception('用户信息获取失败');
-            }
                 $data = [
                     'title' => $feeUserInfo['UserName'] ?? '',
                 ];
@@ -145,14 +148,7 @@ class InvoiceIssuance extends Base
                     $data['type'] = 1;
                 }
                 $data['tax_number'] = empty($feeUserInfo['CertificateCode']) ? $feeUserInfo['CertificateCode'] : '';
-
+            }
-//            if ($data['type'] === 0) {
-//                $data['address'] = $feeUserInfo['MaillingAddress'];
-//                $data['telephone'] = $feeUserInfo['Telephone'];
-//                $data['bank_name'] = $feeUserInfo['BankName'];
-//                $data['bank_account'] = $feeUserInfo['BankAccountCode'];
-//            }
-
             return $this->buildSuccess($data);
         } catch (\Exception $e) {
             return $this->buildFailed(ReturnCode::NOT_EXISTS, $e->getMessage());
@@ -200,7 +196,7 @@ class InvoiceIssuance extends Base
             //验证 、 新建抬头、获取抬头id
             validate(InvoiceHeadValidate::class)->scene('type')->check($params);
             validate(InvoiceHeadValidate::class)->scene('type'.$params['type'])->check($params);
-            $data['invoice_head_id'] = InvoiceHead::createHead($wechat_user_id,$params);
+            $data['invoice_head_id'] = InvoiceHead::createHead($wechat_user_id, $params);
 
             if ($id) {
                 validate(InvoiceIssuanceValidate::class)->scene('edit')->check($params);

app/model/InvoiceHead.php

@@ -2,6 +2,8 @@
 
 namespace app\model;
 
+use app\service\invoice\InvoiceIssuanceService;
+use fast\FuncException;
 use think\Model;
 
 class InvoiceHead extends Model
@@ -9,14 +11,22 @@ class InvoiceHead extends Model
 
     public static $typeArr = ['单位', '个人'];
 
+    /**
+     *
+     * @param $wechat_user_id
+     * @param $data
+     * @return mixed
+     * @throws FuncException
+     */
     public static function createHead($wechat_user_id, $data)
     {
 
-        if (isset($data['tax_number']) && $data['tax_number'] == 'undefined') $data['tax_number'] = '';
+        $feeUserInfo = (new InvoiceIssuanceService())->getFeeUserData($data['pucode']);
+
         $param = [
             'type'           => $data['type'],
-            'title'          => $data['title'],
+            'title'          => $feeUserInfo['UserName'] ?? '',
-            'tax_number'     => $data['tax_number'],
+            'tax_number'     => $feeUserInfo['CertificateCode'] ?? '',
             'wechat_user_id' => $wechat_user_id
         ];
 
@@ -25,10 +35,10 @@ class InvoiceHead extends Model
             return $id;
         }
 
-        $param['address']      = $data['address'] ?? '';
+        $param['address']      = $feeUserInfo['MaillingAddress'] ?? '';
-        $param['telephone']    = $data['telephone'] ?? '';
+        $param['telephone']    = $feeUserInfo['Telephone'] ?? '';
-        $param['bank_name']    = $data['bank_name'] ?? '';
+        $param['bank_name']    = $feeUserInfo['BankName'] ?? '';
-        $param['bank_account'] = $data['bank_account'] ?? '';
+        $param['bank_account'] = $feeUserInfo['BankAccountCode'] ?? '';
         $param['create_time']  = time();
 
 

app/service/invoice/InvoiceIssuanceService.php

@@ -190,7 +190,7 @@ class InvoiceIssuanceService
      * @return array|mixed
      * @throws FuncException
      */
-    private function getFeeUserData($pucode)
+    public function getFeeUserData($pucode)
     {
         $FeeService = new FeeService($pucode);
         $feeUsers   = $FeeService->getUsers();