소스 검색

Merge branch 'zhongqi-lakala-jingjian' into dev

shizhongqi 1 개월 전
부모
커밋
0fe16d91d8
1개의 변경된 파일15개의 추가작업 그리고 7개의 파일을 삭제
  1. 15 7
      biz-ghs/lakala/services/LakalaAccountService.php

+ 15 - 7
biz-ghs/lakala/services/LakalaAccountService.php

@@ -628,7 +628,7 @@ class LakalaAccountService
         return [
             'mode' => 'create',
             'license' => [
-                'merchantType' => 'TP_PERSONAL', 'licenseName' => '', 'licenseNo' => '',
+                'merchantType' => 'TP_MERCHANT', 'licenseName' => '', 'licenseNo' => '',
                 'licenseStart' => '', 'licenseEnd' => '9999-12-31', 'registeredAddress' => '',
                 'businessContent' => '', 'legalName' => '', 'legalIdNo' => '',
                 'legalIdStart' => '', 'legalIdEnd' => '9999-12-31', 'attachments' => [],
@@ -657,12 +657,20 @@ class LakalaAccountService
         ];
     }
 
+    /**
+     * 商户请求数据构建
+     * 请参照拉卡拉"新增商户进件"接口文档进行核实参数
+     * @param array $form
+     * @param string $contractNo
+     * @param LakalaOnboardingClient $client
+     * @return array
+     */
     private static function merchantRequest(array $form, $contractNo, $client)
     {
-        $l = $form['license'];
-        $m = $form['merchant'];
-        $s = $form['settlement'];
-        $shop = $form['shop'];
+        $l = $form['license'];  //营业执照信息
+        $m = $form['merchant']; //商家信息
+        $s = $form['settlement']; //收款银行卡信息
+        $shop = $form['shop']; //门店信息(带有门店图片信息)
         $fees = self::merchantFees();
 
         return [
@@ -688,8 +696,8 @@ class LakalaAccountService
             'is_legal_person' => (bool)$s['isLegalPerson'],
             'lar_name' => $l['legalName'], 'lar_id_type' => '01', 'lar_id_card' => $l['legalIdNo'],
             'lar_id_card_start' => $l['legalIdStart'], 'lar_id_card_end' => $l['legalIdEnd'],
-            'contact_mobile' => $m['contactMobile'],
-            'contact_name' => $m['contactName'],
+            'contact_mobile' => $shop['contactMobile'] != '' ? $shop['contactMobile'] : $m['contactMobile'],
+            'contact_name' => $l['legalName'] != '' ? $l['legalName'] : ($shop['contactName'] ?? $m['contactName']),
             'openning_bank_code' => $s['bankNo'],
             'openning_bank_name' => $s['bankName'],
             'clearing_bank_code' => $s['clearingBankNo'], 'settle_province_code' => $s['provinceCode'],