Merge branch 'v2'

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(string $token,int $order_id,int $buyer_id,int $store_id,string $order_sn,int $money)
+ * @method ResultInterface deferSaveBill(int $order_id,int $buyer_id,int $store_id,string $order_sn,int $money,string $orderName,int $orderType)
  * @method ResultInterface deferGetListByOrderId(int $storeId, int $orderId)
  * @method ResultInterface deferGetListByOrderId(int $storeId, int $orderId)
  * Interface AgencyInterface
  * Interface AgencyInterface
  * @package App\Lib
  * @package App\Lib
@@ -26,6 +26,8 @@ interface BillInterface{
 	 * @param int    $storeId   // 店铺id
 	 * @param int    $storeId   // 店铺id
 	 * @param string $orderSn   //订单号
 	 * @param string $orderSn   //订单号
 	 * @param int    $money     //订单金额
 	 * @param int    $money     //订单金额
+	 * @param string $orderName //订单名称
+	 * @param int    $orderType //订单类型
 	 * @return mixed
 	 * @return mixed
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
@@ -34,7 +36,9 @@ interface BillInterface{
 		int $buyerId,
 		int $buyerId,
 		int $storeId,
 		int $storeId,
 		string $orderSn,
 		string $orderSn,
-		int $money
+		int $money,
+		string $orderName,
+		int $orderType
 	);
 	);
 
 
     public function getListByOrderId(int $storeId, int $orderId);
     public function getListByOrderId(int $storeId, int $orderId);

src/Craftsman/Lib/CraftsmanInterface.php

@@ -20,6 +20,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetCraftsmenByUnionId(string $unionId)
  * @method ResultInterface deferGetCraftsmenByUnionId(string $unionId)
  * @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)
  */
  */
 interface CraftsmanInterface
 interface CraftsmanInterface
 {
 {
@@ -74,4 +75,14 @@ interface CraftsmanInterface
      */
      */
     public function getCraftsmenByIds(int $storeId, array $cmanIds);
     public function getCraftsmenByIds(int $storeId, array $cmanIds);
 
 
+    /**
+     * 提供给商品服务，用来同步店员所属的商品
+     *
+     * @param integer $storeId
+     * @param array $itemIds
+     * @param integer $mode 取值：1 表示新增，2 表示去除
+     * @return boolen
+     */
+    public function syncItems(int $storeId, array $itemIds, int $mode);
+
 }
 }
\ No newline at end of file

src/Goods/Lib/GoodsInterface.php

@@ -8,6 +8,7 @@
 
 
 namespace Hdll\Services\Goods\Lib;
 namespace Hdll\Services\Goods\Lib;
 
 
+use App\Exception\ServiceException;
 use Swoft\Core\ResultInterface;
 use Swoft\Core\ResultInterface;
 
 
 /**
 /**
@@ -25,6 +26,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferGetTopThreeSales($storeId)
  * @method ResultInterface deferGetTopThreeSales($storeId)
  * @method ResultInterface deferGetReturnVisitByGoodsIds($storeId, $goodsIds)
  * @method ResultInterface deferGetReturnVisitByGoodsIds($storeId, $goodsIds)
+ * @method ResultInterface deferCountEvaluate($storeId, $time)
+ * @method ResultInterface deferFind($storeId, $id)
  * Interface GoodsInterface
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  * @package Hdll\Services\Goods\Lib
  */
  */
@@ -34,6 +37,7 @@ interface GoodsInterface
 	/**
 	/**
 	 * 获取商品
 	 * 获取商品
 	 * @param $storeId
 	 * @param $storeId
+	 * @param $id
 	 * @return [
 	 * @return [
 	 *                'gcId'   商品类ID
 	 *                'gcId'   商品类ID
 	 *                'asId'   服务ID
 	 *                'asId'   服务ID
@@ -46,7 +50,6 @@ interface GoodsInterface
 	 *                'originalPrice'  原价
 	 *                'originalPrice'  原价
 	 *                'sales'  销量
 	 *                'sales'  销量
 	 *                ]
 	 *                ]
-     * @param $id
 	 * @return mixed
 	 * @return mixed
 	 * @author Administrator
 	 * @author Administrator
 	 */
 	 */
@@ -175,4 +178,12 @@ interface GoodsInterface
 	 * @author work
 	 * @author work
 	 */
 	 */
 	public function getReturnVisitByGoodsIds($storeId, $goodsIds);
 	public function getReturnVisitByGoodsIds($storeId, $goodsIds);
+
+	/**
+	 * 获取商品（包括已删除）
+	 * @param $storeId
+	 * @param $id
+	 * @return array|mixed
+	 */
+	public function find($storeId, $id);
 }
 }

src/Recharge/Enum/RechargeCmq.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: mac
+ * Date: 2019-01-10
+ * Time: 09:58
+ */
+
+namespace Hdll\Services\Recharge\Enum;
+
+class RechargeCmq{
+
+    const TOPIC = 'recharge';
+
+    const PAY_STATUS = 'payStatus'; // 购买储值卡状态修改回调
+}
\ No newline at end of file

src/TimesCard/Enum/TimesCardCmq.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: mac
+ * Date: 2019-01-10
+ * Time: 09:58
+ */
+
+namespace Hdll\Services\TimesCard\Enum;
+
+class TimesCardCmq{
+
+    const TOPIC = 'timescard';
+
+    const PAY_STATUS = 'payStatus'; // 购买次卡状态修改回调
+}
\ No newline at end of file