调整rpc接口文件命名空间

LICENSE

-Copyright (c) 2006-2019 meibuyu library
+Copyright (c) 2006-2021 meibuyu library
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

composer.json

 {
-  "name": "meibuyu/micro",
-  "description": "美不语微服务公共接口库",
-  "type": "library",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "梁俊杰",
-      "email": "blithe8787@163.com"
-    }
-  ],
-  "require": {
-    "ext-json": "*",
-    "ext-redis": "*",
-    "ext-gd": "*",
-    "ext-curl": "*",
-    "ext-mbstring": "*",
-    "hyperf/cache": "~1.1.0",
-    "hyperf/framework": "~1.1.0",
-    "hyperf/db-connection": "~1.1.0",
-    "hyperf/validation": "~1.1.0",
-    "hyperf/command": "~1.1.0",
-    "hyperf/redis": "~1.1.0",
-    "hyperf/guzzle": "~1.1.0",
-    "hyperf/config": "~1.1.0",
-    "hyperf/logger": "~1.1.0",
-    "hyperf/service-governance": "~1.1.0",
-    "fzaninotto/faker": "^1.9",
-    "phpoffice/phpspreadsheet": "^1.18",
-    "dimsav/unix-zipper": "1.*",
-    "hyperf/amqp": "~1.1.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Meibuyu\\Micro\\": "src/"
+    "name": "meibuyu/rpc",
+    "description": "美不语微服务RPC接口库",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Zero",
+            "email": "wangyuanwmm@163.com"
+        }
+    ],
+    "require": {
+    },
+    "autoload": {
+        "psr-4": {
+            "Meibuyu\\Rpc\\": "src/"
+        }
     },
-    "files": [
-      "src/functions.php",
-      "src/const.php"
-    ]
-  },
-  "extra": {
-    "hyperf": {
-      "config": "Meibuyu\\Micro\\ConfigProvider"
+    "extra": {
+        "hyperf": {
+            "config": "Meibuyu\\Rpc\\ConfigProvider"
+        }
     }
-  }
 }

src/Exceptions/RpcException.php

 <?php
 
-namespace Meibuyu\Micro\Exceptions;
+namespace Meibuyu\Rpc\Exceptions;
 
 use Throwable;
 

src/Service/Interfaces/AppServiceInterface.php → src/Service/Interfaces/App/AppServiceInterface.php

 <?php
 /**
  * Created by PhpStorm.
- * User: zero
+ * User: Zero
  * Date: 2020/3/27
  * Time: 15:03
  */
 
-namespace Meibuyu\Micro\Service\Interfaces;
+namespace Meibuyu\Rpc\Service\Interfaces\App;
 
 interface AppServiceInterface
 {

src/Service/Interfaces/DatacenterServiceInterface.php → src/Service/Interfaces/Datacenter/DatacenterServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces;
+namespace Meibuyu\Rpc\Service\Interfaces\Datacenter;
 
 interface DatacenterServiceInterface
 {
@@ -36,5 +36,4 @@ interface DatacenterServiceInterface
      */
     public function getCurrencyListRate($currencyIds, $field = ['id', 'currency_id', 'rate_val'], $where = []): array;
 
-
-}
\ No newline at end of file
+}

src/Service/Interfaces/File/FileServiceInterface.php

 <?php
 
-
-namespace Meibuyu\Micro\Service\Interfaces\File;
-
+namespace Meibuyu\Rpc\Service\Interfaces\File;
 
 interface FileServiceInterface
 {
@@ -12,4 +10,4 @@ interface FileServiceInterface
      * @return mixed
      */
     public function generateBarCode($type, $number);
-}
\ No newline at end of file
+}

src/Service/Interfaces/Flow/GetConnectModuleServiceInterface.php

 <?php
 
-
-namespace Meibuyu\Micro\Service\Interfaces\Flow;
-
+namespace Meibuyu\Rpc\Service\Interfaces\Flow;
 
 interface GetConnectModuleServiceInterface
 {
@@ -12,4 +10,4 @@ interface GetConnectModuleServiceInterface
      * @return mixed
      */
     public function getConnectModule($channel);
-}
\ No newline at end of file
+}

src/Service/Interfaces/Flow/ProcessFormServiceInterface.php

 <?php
 
-
-namespace Meibuyu\Micro\Service\Interfaces\Flow;
-
+namespace Meibuyu\Rpc\Service\Interfaces\Flow;
 
 interface ProcessFormServiceInterface
 {
@@ -22,4 +20,4 @@ interface ProcessFormServiceInterface
      * @return mixed
      */
     public function operateFlow($ApplyId, $operate);
-}
\ No newline at end of file
+}

src/Service/Interfaces/Logistics/LogisticsServiceInterface.php

 <?php
 
-
-namespace Meibuyu\Micro\Service\Interfaces\Logistics;
-
+namespace Meibuyu\Rpc\Service\Interfaces\Logistics;
 
 interface LogisticsServiceInterface
 {
@@ -12,8 +10,7 @@ interface LogisticsServiceInterface
      * @param array $logisticsInfo 物流公司信息 $logisticsInfo = [['logistics_code' => '', 'logistics_no' => '']];
      * @return mixed
      */
-
-    public function push($module,$logisticsInfo);
+    public function push($module, $logisticsInfo);
 
     /**
      * 根据物流单号查询物流信息
@@ -21,4 +18,4 @@ interface LogisticsServiceInterface
      * @return mixed
      */
     public function logisticsInfo($logisticsNo);
-}
\ No newline at end of file
+}

src/Service/Interfaces/DingTalk/DingDepartmentServiceInterface.php → src/Service/Interfaces/Message/DingTalk/DingDepartmentServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:48
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\DingTalk;
+namespace Meibuyu\Rpc\Service\Interfaces\Message\DingTalk;
 
 interface DingDepartmentServiceInterface
 {

src/Service/Interfaces/DingTalk/DingMessageServiceInterface.php → src/Service/Interfaces/Message/DingTalk/DingMessageServiceInterface.php

@@ -6,9 +6,7 @@
  * Time: 15:48
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\DingTalk;
-
-use phpDocumentor\Reflection\Types\Mixed_;
+namespace Meibuyu\Rpc\Service\Interfaces\Message\DingTalk;
 
 interface DingMessageServiceInterface
 {
@@ -18,13 +16,12 @@ interface DingMessageServiceInterface
      *
      * @param string $sender 消息发送者 userId
      * @param string $cid 群会话或者个人会话的id，通过JSAPI接口唤起联系人界面选择会话获取会话cid；小程序参考获取会话信息，H5微应用参考获取会话信息
-     * @param array  $message 消息内容，消息类型和样例可参考“消息类型与数据格式”文档。最长不超过2048个字节
+     * @param array $message 消息内容，消息类型和样例可参考“消息类型与数据格式”文档。最长不超过2048个字节
      *
      * @return mixed
      */
     public function sendGeneralMessage($sender, $cid, $message);
 
-
     /**
      * 发送工作通知消息
      * @param array $params
@@ -45,12 +42,12 @@ interface DingMessageServiceInterface
      */
     public function corporationMessage($taskId);
 
-	/**
-	 * 发送text钉钉消息
-	 * @param integer $templateId 模板id
-	 * @param array $replace 替换内容（注意顺序）
-	 * @param array $userIds 用户id（这个是微服务用户的id）
-	 * @return mixed
-	 */
-	public function sendTextMessage($templateId, $replace, $userIds);
+    /**
+     * 发送text钉钉消息
+     * @param integer $templateId 模板id
+     * @param array $replace 替换内容（注意顺序）
+     * @param array $userIds 用户id（这个是微服务用户的id）
+     * @return mixed
+     */
+    public function sendTextMessage($templateId, $replace, $userIds);
 }

src/Service/Interfaces/DingTalk/DingUserServiceInterface.php → src/Service/Interfaces/Message/DingTalk/DingUserServiceInterface.php

@@ -6,11 +6,12 @@
  * Time: 15:48
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\DingTalk;
+namespace Meibuyu\Rpc\Service\Interfaces\Message\DingTalk;
 
 interface DingUserServiceInterface
 {
-    /** 通过用户id获取单个用户信息
+    /**
+     * 通过用户id获取单个用户信息
      * @param string $ding_user_id 钉钉用户id
      * @return array 钉钉用户信息
      */

src/Service/Interfaces/MessageServiceInterface.php → src/Service/Interfaces/Message/MessageServiceInterface.php

@@ -6,9 +6,7 @@
  * Time: 15:48
  */
 
-namespace Meibuyu\Micro\Service\Interfaces;
-
-use phpDocumentor\Reflection\Types\Integer;
+namespace Meibuyu\Rpc\Service\Interfaces\Message;
 
 interface MessageServiceInterface
 {
@@ -23,7 +21,6 @@ interface MessageServiceInterface
      */
     public function send(array $receiveUserId, $application, $templateId = 0, $sendUserId = 0, $replace = [], $content = ''): bool;
 
-
     /**
      * description:发送邮件
      * author: fuyunnan
@@ -36,7 +33,6 @@ interface MessageServiceInterface
      */
     public function sendMail($userList, $subject, $body): bool;
 
-
     /**
      * 发送markdown文本消息
      * @param array $receiveUserId
@@ -58,4 +54,5 @@ interface MessageServiceInterface
      * @return bool
      */
     public function sendSms(string $phone, string $templateCode, array $params): bool;
+
 }

src/Service/Interfaces/Operation/OperationServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 10:09
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Operation;
+namespace Meibuyu\Rpc\Service\Interfaces\Operation;
 
 interface OperationServiceInterface
 {
@@ -23,4 +23,4 @@ interface OperationServiceInterface
      * @return mixed
      */
     public function getBusinessSaleOtherDatumRmb(array $conditions);
-}
\ No newline at end of file
+}

src/Service/Interfaces/Order/ShopifyOrderServiceInterface.php

@@ -6,9 +6,7 @@
  * Time: 15:48
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Order;
-
-
+namespace Meibuyu\Rpc\Service\Interfaces\Order;
 
 interface ShopifyOrderServiceInterface
 {

src/Service/Interfaces/Order/StockUpServiceInterface.php

 <?php
-namespace Meibuyu\Micro\Service\Interfaces\Order;
 
+namespace Meibuyu\Rpc\Service\Interfaces\Order;
 
 interface StockUpServiceInterface
 {
@@ -9,19 +9,19 @@ interface StockUpServiceInterface
      * @param $stockNo
      * @return mixed
      */
-    public function stockIntoUpdateStatus($stockNo):bool;
+    public function stockIntoUpdateStatus($stockNo): bool;
 
     /**
      * 跟进物流单号
      * @param $logisticsNo
      * @return array
      */
-    public function getStockUpInfoByLogisticsNo($logisticsNo):array;
+    public function getStockUpInfoByLogisticsNo($logisticsNo): array;
 
     /**
      *
      * @param $sourceNo
      * @return array
      */
-    public function getStockUpInfoByOrderNo($sourceNo):array;
+    public function getStockUpInfoByOrderNo($sourceNo): array;
 }

src/Service/Interfaces/Order/SubOrderServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 10:09
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Order;
+namespace Meibuyu\Rpc\Service\Interfaces\Order;
 
 interface SubOrderServiceInterface
 {
@@ -57,7 +57,6 @@ interface SubOrderServiceInterface
      * @param array $source 来源单号数组
      * @return array
      */
-
     public function getBySourceSite($source): array;
 
     /**
@@ -83,7 +82,7 @@ interface SubOrderServiceInterface
      *      ]
      * @return bool
      */
-    public function purchaseCompleted($data,$type): bool;
+    public function purchaseCompleted($data, $type): bool;
 
     /**
      * 1688采购异常订单 修改OA子订单状态
@@ -91,7 +90,7 @@ interface SubOrderServiceInterface
      * @param $errorCode //异常信息 1 取消 2其他
      * @return array
      */
-    public function purchaseError($orderId,$errorCode):array ;
+    public function purchaseError($orderId, $errorCode): array;
 
     /**
      * 1688采购取消
@@ -99,7 +98,7 @@ interface SubOrderServiceInterface
      * @param $editData
      * @return bool
      */
-    public function purchaseCancel($orderNo,$editData = []):bool;
+    public function purchaseCancel($orderNo, $editData = []): bool;
 
     /**
      * 1688采购 修改oa子订单
@@ -111,7 +110,7 @@ interface SubOrderServiceInterface
      *       ]
      * @return array
      */
-    public function purchaseEdit($editData):bool ;
+    public function purchaseEdit($editData): bool;
 
     /**
      * 删除物流信息
@@ -121,6 +120,6 @@ interface SubOrderServiceInterface
      *       ]
      * @return bool
      */
-    public function purchaseDelete($data):bool;
+    public function purchaseDelete($data): bool;
 
-}
\ No newline at end of file
+}

src/Service/Interfaces/Product/MaterialServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Product;
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
 
 interface MaterialServiceInterface
 {

src/Service/Interfaces/Product/PlatformProductChildServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Product;
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
 
 interface PlatformProductChildServiceInterface
 {

src/Service/Interfaces/Product/PlatformProductServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Product;
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
 
 interface PlatformProductServiceInterface
 {

src/Service/Interfaces/Product/ProductChildServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Product;
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
 
 interface ProductChildServiceInterface
 {

src/Service/Interfaces/Product/ProductServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Product;
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
 
 interface ProductServiceInterface
 {

src/Service/Interfaces/Product/ShopifyProductServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 9:39
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Product;
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
 
 interface ShopifyProductServiceInterface
 {

src/Service/Interfaces/Product/ShopifyServiceInterface.php

@@ -6,10 +6,10 @@
  * Time: 9:39
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Product;
+namespace Meibuyu\Rpc\Service\Interfaces\Product;
 
 use Exception;
-use Meibuyu\Micro\Exceptions\RpcException;
+use Meibuyu\Rpc\Exceptions\RpcException;
 
 interface ShopifyServiceInterface
 {

src/Service/Interfaces/ProductChildServiceInterface.php

-<?php
-/**
- * Created by PhpStorm.
- * User: 王源
- * Date: 2020/1/9
- * Time: 15:07
- */
-
-namespace Meibuyu\Micro\Service\Interfaces;
-
-interface ProductChildServiceInterface
-{
-
-    /**
-     * 获取单个数据
-     * @param int $id 子SKU id
-     * @param array $columns 子SKU表的字段，默认显示全部
-     * @param array $relations 子SKU的关联关系,可传入['brand', 'category', 'product_name', 'images', 'cost']
-     * @return array|null
-     */
-    public function get($id, array $columns = ['*'], array $relations = []);
-
-    /**
-     * 通过id列表获取产品数组
-     * @param array $idList 子SKUid的列表, 默认去重
-     * @param array $columns 子SKU表的字段，默认显示全部
-     * @param array $relations 子SKU的关联关系,可传入['brand', 'category', 'product_name', 'images', 'cost']
-     * @return array 默认keyBy('id')
-     */
-    public function getByIdList(array $idList, array $columns = ['*'], array $relations = []): array;
-
-    /**
-     * 通过sku列表获取子产品列表
-     * @param array $skuList 默认去重
-     * @param array $columns
-     * @return array 默认keyBy('child_sku')
-     */
-    public function getListBySkuList(array $skuList, array $columns = ['id']);
-
-}

src/Service/Interfaces/Production/ProductionServiceInterface.php

 <?php
 
-namespace Meibuyu\Micro\Service\Interfaces\Production;
-
-use Meibuyu\Micro\Exceptions\HttpResponseException;
+namespace Meibuyu\Rpc\Service\Interfaces\Production;
 
 interface ProductionServiceInterface
 {
@@ -19,7 +17,7 @@ interface ProductionServiceInterface
      *     'count' => '123', // 入库数量, 必须
      *   ]
      * ]
-     * @throws HttpResponseException
+     * @throws \Meibuyu\Rpc\Exceptions\RpcException
      * @author Zero
      */
     public function warehousingCallback(array $params);

src/Service/Interfaces/Purchase/PurchaseDoneServiceInterface.php

 <?php
 
-
-namespace Meibuyu\Micro\Service\Interfaces\Purchase;
-
+namespace Meibuyu\Rpc\Service\Interfaces\Purchase;
 
 interface PurchaseDoneServiceInterface
 {
@@ -34,4 +32,4 @@ interface PurchaseDoneServiceInterface
      * @return mixed
      */
     public function getOrderStatus($orderIds);
-}
\ No newline at end of file
+}

src/Service/Interfaces/Purchase/PurchaseTaskServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 14:22:52
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Purchase;
+namespace Meibuyu\Rpc\Service\Interfaces\Purchase;
 
 interface PurchaseTaskServiceInterface
 {
@@ -29,7 +29,7 @@ interface PurchaseTaskServiceInterface
      *     'auth' => Auth::user() // 当前用户
      * ]
      * @return bool
-     * @throws \Meibuyu\Micro\Exceptions\RpcException
+     * @throws \Meibuyu\Rpc\Exceptions\RpcException
      * @author Zero
      */
     public function noticeCancel(array $data);
@@ -40,7 +40,7 @@ interface PurchaseTaskServiceInterface
      * @param array $data 要更新的数据如['specification', 'remark']等
      * @param int $type 采购类型,默认为订单采购,可传参数[1(订单采购); 2(备货采购); 3(样品采购)]
      * @return bool
-     * @throws \Meibuyu\Micro\Exceptions\RpcException
+     * @throws \Meibuyu\Rpc\Exceptions\RpcException
      * @author Zero
      */
     public function updateProduct($sourceId, array $data, $type = 1);

src/Service/Interfaces/DispatchPlanServiceInterface.php → src/Service/Interfaces/Store/DispatchPlanServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:48
  */
 
-namespace Meibuyu\Micro\Service\Interfaces;
+namespace Meibuyu\Rpc\Service\Interfaces\Store;
 
 
 interface DispatchPlanServiceInterface

src/Service/Interfaces/Store/StoreMaterialServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\Store;
+namespace Meibuyu\Rpc\Service\Interfaces\Store;
 
 interface StoreMaterialServiceInterface
 {

src/Service/Interfaces/StoreServiceInterface.php → src/Service/Interfaces/Store/StoreServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces;
+namespace Meibuyu\Rpc\Service\Interfaces\Store;
 
 interface StoreServiceInterface
 {
@@ -34,16 +34,16 @@ interface StoreServiceInterface
      * description:根据筛选条件获取仓库的库存列表 对库存筛选实现大一统
      * 参数格式 不需要可不传入对应的键
      *  $args['inTeamIds'] =[];
-    $args['notInTeamIds'] = [];
-    $args['inWhIds'] = []; //仓库id
-    $args['notInWhIds'] = [];
-    $args['inProductIds'] = [];
-    $args['notInProductIds'] = [];
-    $args['where'] = [];
-    $args['group'] = ['product_id'];//默认['product_id']
-    $args['keyBy'] = 'product_id';//默认排序
-    $args['isKeyBy'] = $condition['isKeyBy'] ?? true;//是否加keyBy;
-    $args['isGroupBy'] = $condition['isGroupBy'] ?? true;//是否加分组;
+     * $args['notInTeamIds'] = [];
+     * $args['inWhIds'] = []; //仓库id
+     * $args['notInWhIds'] = [];
+     * $args['inProductIds'] = [];
+     * $args['notInProductIds'] = [];
+     * $args['where'] = [];
+     * $args['group'] = ['product_id'];//默认['product_id']
+     * $args['keyBy'] = 'product_id';//默认排序
+     * $args['isKeyBy'] = $condition['isKeyBy'] ?? true;//是否加keyBy;
+     * $args['isGroupBy'] = $condition['isGroupBy'] ?? true;//是否加分组;
      *
      * author: fuyunnan
      * @param array $condition 筛选条件
@@ -157,7 +157,6 @@ interface StoreServiceInterface
     public function createBatchWarehousingStatus(array $attributes): bool;
 
 
-
     /**
      * description:批量创建出库单,出库单直接出库
      * author: fuyunnan
@@ -297,6 +296,7 @@ interface StoreServiceInterface
      * Date: 2020/11/25
      */
     public function autoSkuStock($data): array;
+
     /**
      * description:订单通知取消更改字段 不在生成出库单
      * author: fuyunnan

src/Service/Interfaces/User/AccessServiceInterface.php

 <?php
 /**
  * Created by PhpStorm.
- * User: zero
+ * User: Zero
  * Date: 2020/5/26
  * Time: 15:17
  */
 
-namespace Meibuyu\Micro\Service\Interfaces\User;
+namespace Meibuyu\Rpc\Service\Interfaces\User;
 
 interface AccessServiceInterface
 {

src/Service/Interfaces/BaseInfoServiceInterface.php → src/Service/Interfaces/User/BaseInfoServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces;
+namespace Meibuyu\Rpc\Service\Interfaces\User;
 
 interface BaseInfoServiceInterface
 {
@@ -14,8 +14,6 @@ interface BaseInfoServiceInterface
     /**
      * 通过单个id获取岗位数组
      * @param int $id
-     * @param array $columns
-     * @param array $relations
      * @return array
      */
     public function getPositionListById(int $id): array;

src/Service/Interfaces/UserServiceInterface.php → src/Service/Interfaces/User/UserServiceInterface.php

@@ -6,7 +6,7 @@
  * Time: 15:07
  */
 
-namespace Meibuyu\Micro\Service\Interfaces;
+namespace Meibuyu\Rpc\Service\Interfaces\User;
 
 interface UserServiceInterface
 {