Merge branch 'develop' of git.huaperfect.com:hwq/micro into develop (11f57dba) · Commits · without_auth / meibuyu-rpc

src/Handler/MessageHandler.php

+49 −0

Original line number	Diff line number	Diff line
		@@ -64,4 +64,53 @@ class MessageHandler
		$this->messageService->send($receiverIds, $application, 0, $sendUserId, [], $content);
		}

		/**
		* 自动发送模板消息
		* @param $receiverIds
		* @param $templateId
		* @param array $replace
		* @throws HttpResponseException
		*/
		public function sendAutoTemp($receiverIds, $templateId, $replace = [])
		{
		$application = $this->config->get('app_name');
		if (!$application) {
		throw new HttpResponseException("请设置应用名app_name");
		}
		$receiverIds = is_array($receiverIds) ? $receiverIds : [$receiverIds];
		$this->messageService->send($receiverIds, $application, $templateId, 0, $replace);
		}

		/**
		* 自动发送文本消息
		* @param $receiverIds
		* @param $content
		* @throws \Exception
		*/
		public function sendAutoText($receiverIds, $content)
		{
		$application = $this->config->get('app_name');
		if (!$application) {
		throw new \Exception("请设置应用名app_name");
		}
		$receiverIds = is_array($receiverIds) ? $receiverIds : [$receiverIds];
		$this->messageService->send($receiverIds, $application, 0, 0, [], $content);
		}

		/**
		* 定时任务专用发送文本消息
		* @param $receiverIds
		* @param $content
		* @throws HttpResponseException
		*/
		public function sendCrontabText($receiverIds, $content)
		{
		$application = $this->config->get('app_name');
		if (!$application) {
		throw new HttpResponseException("请设置应用名app_name");
		}
		$receiverIds = is_array($receiverIds) ? $receiverIds : [$receiverIds];
		$this->messageService->send($receiverIds, $application, 0, 0, [], $content);
		}

		}

src/Service/Interfaces/MaterialServiceInterface.php

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		<?php
		/**
		* Created by PhpStorm.
		* User: 梁俊杰
		* Date: 2020/5/15
		* Time: 15:07
		*/

		namespace Meibuyu\Micro\Service\Interfaces;

		interface MaterialServiceInterface
		{

		/**
		* 获取单个数据
		* @param int $id 原料id
		* @param array $columns 原料表的字段，默认显示全部
		* @return array\|null
		*/
		public function get($id, array $columns = ['*']);

		/**
		* 通过id列表获取原料数组
		* @param array $idList 原料id的列表, 默认去重
		* @param array $columns 原料表的字段，默认显示全部
		* @return array 默认keyBy('id')
		*/
		public function getByIdList(array $idList, array $columns = ['*']): array;

		/**
		* 通过内部code列表获取原料列表
		* @param array $codeList 默认去重
		* @param array $columns
		* @return array 默认keyBy('internal_code')
		*/
		public function getByCodeList(array $codeList, array $columns = ['id']);

		/**
		* 通过原料品名id列表获取原料品名数组
		* @param array $idList 原料品名id的列表, 默认去重
		* @param array $columns 原料品名表的字段，默认显示全部
		* @return array 默认keyBy('id')
		*/
		public function getMaterialNamesByIdList(array $idList, array $columns = ['*']): array;

		}

src/Service/Interfaces/Product/MaterialServiceInterface.php

+11 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ interface MaterialServiceInterface
		* 获取指定品名下所有的原料数据
		* @param array $nameIds 默认去重
		* @param array $columns
		* @return array 默认keyBy('material_name_id')
		* @return array 默认groupBy('material_name_id')
		*/
		public function getListByNameIds(array $nameIds, array $columns = ['*']);

		@@ -76,9 +76,17 @@ interface MaterialServiceInterface
		/**
		* 获取产品对应颜色绑定的原料
		* @param $productId
		* @param array $colorIds
		* @param array $colorIds 默认去重
		* @param bool $withMaterials
		* @return array 默认keyBy('color_id')
		*/
		public function getProductColorMaterials($productId, array $colorIds, $withMaterials = false);

		/**
		* 获取维护完全原料数量的颜色id
		* @param $productId
		* @return array
		*/
		public function getProductColorMaterials($productId, array $colorIds);
		public function getFullMaterialCountColorIds($productId);

		}

src/Service/Interfaces/Product/PlatformProductChildServiceInterface.php

+5 −5

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ interface PlatformProductChildServiceInterface
		/**
		* 通过id列表获取平台子产品数组
		* @param array $idList 平台子产品id的列表, 默认去重
		* @param array $relations 平台子产品的关联关系，支持：["platform_product","product_child","weight"]
		* @param array $relations 平台子产品的关联关系，支持：["platform_product","product_child","weight","packs"]
		* @param array $columns 平台子产品表的字段，默认全部字段
		* ['id','platform_product_id','product_child_id','platform_product_child_sku','asin','fnsku','is_sale']
		* @return array 默认keyBy('id')
		@@ -35,7 +35,7 @@ interface PlatformProductChildServiceInterface
		* 获取单个数据
		* @param string $sku 平台子产品sku
		* @param int $siteId 平台子产品所属站点
		* @param array $relations 平台子产品的关联关系，支持：["platform_product","product_child","weight"]
		* @param array $relations 平台子产品的关联关系，支持：["platform_product","product_child","weight","packs"]
		* @param array $columns 平台子产品表的字段，默认全部字段
		* ['id','platform_product_id','product_child_id','platform_product_child_sku','asin','fnsku','is_sale']
		* @return array
		@@ -46,7 +46,7 @@ interface PlatformProductChildServiceInterface
		* 通过sku列表获取平台子产品数组
		* @param array $skuList 平台子产品sku的列表, 默认去重
		* @param int $siteId 平台子产品所属站点
		* @param array $relations 平台子产品的关联关系，支持：["platform_product","product_child","weight"]
		* @param array $relations 平台子产品的关联关系，支持：["platform_product","product_child","weight","packs"]
		* @param array $columns 平台子产品表的字段，默认全部字段
		* ['id','platform_product_id','product_child_id','platform_product_child_sku','asin','fnsku','is_sale']
		* @return array 默认keyBy('platform_product_child_sku')
		@@ -62,7 +62,7 @@ interface PlatformProductChildServiceInterface
		public function getIdsByChildSku(string $childSku, array $limitIds = null);

		/**
		* 获取仓库子sku对应的平台子sku
		* 获取仓库主sku对应的平台主sku
		* @param array $productChildIds 已去重
		* @param null $siteId 指定站点id, 不传或传null,获取全部数据
		* @param array $columns
		@@ -74,7 +74,7 @@ interface PlatformProductChildServiceInterface
		* 通过仓库产品id获取平台子产品数组
		* @param $productId
		* @param null $siteId
		* @param array $relations
		* @param array $relations 平台子产品的关联关系，支持：["platform_product","product_child","weight","packs"]
		* @param array $columns
		* @return array
		*/

src/Service/Interfaces/Product/ProductChildServiceInterface.php

+11 −3

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ interface ProductChildServiceInterface
		* 获取单个数据
		* @param int $id 子SKU id
		* @param array $columns 子SKU表的字段，默认显示全部
		* @param array $relations 子SKU的关联关系,可传入['brand', 'category', 'product_name', 'images', 'cost']
		* @param array $relations 子SKU的关联关系,可传入['brand', 'category', 'product_name', 'images', 'cost', 'weight', 'packs']
		* @return array\|null
		*/
		public function get($id, array $columns = ['*'], array $relations = []);
		@@ -24,7 +24,7 @@ interface ProductChildServiceInterface
		* 通过id列表获取产品数组
		* @param array $idList 子SKUid的列表, 默认去重
		* @param array $columns 子SKU表的字段，默认显示全部
		* @param array $relations 子SKU的关联关系,可传入['brand', 'category', 'product_name', 'images', 'cost']
		* @param array $relations 子SKU的关联关系,可传入['brand', 'category', 'product_name', 'images', 'cost', 'weight', 'packs']
		* @return array 默认keyBy('id')
		*/
		public function getByIdList(array $idList, array $columns = ['*'], array $relations = []): array;
		@@ -33,7 +33,7 @@ interface ProductChildServiceInterface
		* 通过sku列表获取子产品列表
		* @param array $skuList 默认去重
		* @param array $columns 子SKU表的字段，默认返回id
		* @param array $relations 子SKU的关联关系,可传入['color', 'size','brand', 'category', 'product_name', 'images', 'cost', 'weight']
		* @param array $relations 子SKU的关联关系,可传入['color', 'size','brand', 'category', 'product_name', 'images', 'cost', 'weight', 'packs']
		* @return array 默认keyBy('child_sku')
		*/
		public function getListBySkuList(array $skuList, array $columns = ['id'], array $relations = []);
		@@ -92,4 +92,12 @@ interface ProductChildServiceInterface
		*/
		public function getListByProductId(int $productId, $columns = ['id', 'child_sku']);

		/**
		* 模糊搜索仓库子sku,获取id数组
		* @param string $childSku 仓库子sku
		* @param array\|null $limitIds 限制id数组,不传为不限制
		* @return array
		*/
		public function getIdsByChildSku(string $childSku, array $limitIds = null);

		}