Commit 8ed5abc6 authored by zhaopeng343's avatar zhaopeng343
Browse files

Merge branch 'rpc/baseInfo' into purchase_rpc

parents e1347041 e90fadba

src/Manager/UploadManager.php

+4 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class UploadManager 
    {

        $excelOptions = [

            'path' => 'excel',

            'mime' => ['xlsx', 'xls']

            'mime' => ['xlsx', 'xls', 'csv']

        ];

        $options = array_merge($excelOptions, $options);

        return self::uploadFile($excel, $options);
@@ -69,7 +69,7 @@ class UploadManager 
    {

        $excelOptions = [

            'path' => 'excel',

            'mime' => ['xlsx', 'xls']

            'mime' => ['xlsx', 'xls', 'csv']

        ];

        $options = array_merge($excelOptions, $options);

        return self::uploadFile($excel, $options, true);

src/Service/Interfaces/BaseInfoServiceInterface.php

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ interface BaseInfoServiceInterface 
     */

    public function getCountryListByIdList(array $idList, array $columns = ['*']): array;



    /**

     * 通过id数组获取国家区域数组

     * @param array $ids 默认去重

     * @param array $relations ['country'] 可关联国家数据

     * @return array 默认keyBY('id')

     */

    public function getCountryAreaListByIdList(array $ids, array $relations = []): array;



    /**

     * 通过id数组获取团队数组

     * @param array $idList 默认去重

src/Shopify/tools/GraphQL.php

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?php

/**

 * Created by PhpStorm.

 * User: Zero

 * Time: 2021/1/14 9:16

 */



namespace Meibuyu\Micro\Shopify\tools;



class GraphQL

{



    public static function parseDeliveryProfileId($gid)

    {

        if ($gid && stripos($gid, 'gid://shopify/DeliveryProfile/') !== false) {

            $gid = str_replace('gid://shopify/DeliveryProfile/', '', $gid);

        }

        return (int)$gid;

    }



}

src/Tools/Exporter.php

+6 −4
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ class Exporter 
     * @return Exporter

     * @throws PhpSpreadsheetException

     */

    public function append(array $data, $keys = [])

    public function append(array $data, $keys = [], $noStyle = false)

    {

        // 一维数组转二维

        foreach ($data as $v) {
@@ -233,8 +233,10 @@ class Exporter 
        }



        $this->sheet->fromArray($data, null, $this->beginColumnChar . $this->beginRowIndex);

        if (!$noStyle) {

            // 美化样式

            $this->applyStyle($this->beginColumnChar . $this->beginRowIndex . ":" . $this->sheet->getHighestColumn() . ($this->beginRowIndex + count($data) - 1));

        }

        $this->beginRowIndex += count($data);

        return $this;

    }