Merge branch 'ft-buyer-agent' into test

# Conflicts:
#	src/Buyer/Lib/BillInterface.php
#	src/Comments/Enum/StarEnum.php
#	src/Comments/Lib/CommentsInterface.php
#	src/Logistics/Lib/LogisticsInterface.php

UPGRADE_2.x.md

+# 2.0.37
+- 修改店员服务接口
+
 # 2.0.36
 # 2.0.36
 - 店铺服务增加rpc接口
 - 店铺服务增加rpc接口
 
 

src/Buyer/Lib/BillInterface.php

@@ -12,7 +12,7 @@ namespace Hdll\Services\Buyer\Lib;
 use Swoft\Core\ResultInterface;
 use Swoft\Core\ResultInterface;
 
 
 /**
 /**
- * @method ResultInterface deferSaveBill(int $order_id, int $buyer_id, int $store_id, string $order_sn, int $money, string $orderName, int $orderType, int $agentId, array $subOrder)
+ * @method ResultInterface deferSaveBill(int $order_id, int $buyer_id, int $store_id, string $order_sn, int $money, string $orderName, int $orderType, int $agentId, int $itemId)
  * @method ResultInterface deferGetListByOrderId(int $storeId, int $orderId)
  * @method ResultInterface deferGetListByOrderId(int $storeId, int $orderId)
  * Interface AgencyInterface
  * Interface AgencyInterface
  * @package App\Lib
  * @package App\Lib
@@ -30,7 +30,7 @@ interface BillInterface
 	 * @param string $orderName //订单名称
 	 * @param string $orderName //订单名称
 	 * @param int    $orderType //订单类型
 	 * @param int    $orderType //订单类型
 	 * @param int    $agentId   //代理商id
 	 * @param int    $agentId   //代理商id
-	 * @param int    $subOrder
+	 * @param int    $itemId
 	 * @return mixed
 	 * @return mixed
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
@@ -43,7 +43,7 @@ interface BillInterface
 		string $orderName,
 		string $orderName,
 		int $orderType,
 		int $orderType,
 		int $agentId,
 		int $agentId,
-		array $subOrder
+		int $itemId
 	);
 	);
 
 
 	public function getListByOrderId(int $storeId, int $orderId);
 	public function getListByOrderId(int $storeId, int $orderId);

src/Comments/Enum/StarEnum.php

@@ -16,5 +16,9 @@ class StarEnum
 	const HAS_START_KEY = 'comments:hasStar';
 	const HAS_START_KEY = 'comments:hasStar';
 	const STAR_KEY = 'comments:star';
 	const STAR_KEY = 'comments:star';
 
 
+	const VIRTUAL_COMMENTS = 0; //虚拟评论
+	const REAL_COMMENTS = 1;//真实评论
+	const CHILD_COMMENTS = 2;//子评论
 
 
+	const CATEGORY_ACTIVITY_TLP = 0;//活动模版分类
 }
 }
\ No newline at end of file

src/Craftsman/Lib/CraftsmanInterface.php

@@ -22,6 +22,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetCraftsmenById(int $storeId, int $cmanId)
  * @method ResultInterface deferGetCraftsmenById(int $storeId, int $cmanId)
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
  * @method ResultInterface deferSyncItems(int $storeId, array $itemIds, int $mode)
  * @method ResultInterface deferSyncItems(int $storeId, array $itemIds, int $mode)
+ * @method ResultInterface deferUpdateCmanByUnionId(string $unionId, int $storeId, array $data)
  */
  */
 interface CraftsmanInterface
 interface CraftsmanInterface
 {
 {
@@ -107,4 +108,14 @@ interface CraftsmanInterface
      */
      */
     public function syncItems(int $storeId, array $itemIds, int $mode);
     public function syncItems(int $storeId, array $itemIds, int $mode);
 
 
+    /**
+     * 根据unionId修改在指定店铺的店员信息
+     *
+     * @param string  $unionId
+     * @param integer $storeId
+     * @param array $data
+     * @return mixed
+     */
+    public function updateCmanByUnionId(string $unionId, int $storeId, array $data);
+
 }
 }
\ No newline at end of file

src/Logistics/Lib/LogisticsInterface.php

@@ -6,7 +6,7 @@ use Swoft\Core\ResultInterface;
 
 
 /**
 /**
  * @method ResultInterface deferOnPath(array $param)
  * @method ResultInterface deferOnPath(array $param)
- * @method ResultInterface deferHandleFreight($storeId, array $receiver, array $goods)
+ * @method ResultInterface deferHandleFreight($storeId, array $receiver, array $goodsIds)
  * Class LotteryInterface
  * Class LotteryInterface
  * @package Hdll\Services\Logistics\Lib
  * @package Hdll\Services\Logistics\Lib
  */
  */
@@ -19,10 +19,10 @@ interface LogisticsInterface
 	 * 获取运费
 	 * 获取运费
 	 * @param       $storeId
 	 * @param       $storeId
 	 * @param array $receiver
 	 * @param array $receiver
-	 * @param array $goods
+	 * @param array $goodsIds
 	 * @return mixed
 	 * @return mixed
 	 */
 	 */
-	public function handleFreight($storeId, array $receiver, array $goods);
+	public function handleFreight($storeId, array $receiver, array $goodsIds);
 
 
 	/**
 	/**
 	 * 获取收货人地址
 	 * 获取收货人地址