Merge branch 'v2'

src/Buyer/Lib/BillInterface.php

@@ -12,7 +12,7 @@ namespace Hdll\Services\Buyer\Lib;
 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)
  * Interface AgencyInterface
  * @package App\Lib
@@ -21,11 +21,13 @@ interface BillInterface{
 
 	/**
 	 * 保存账单数据
-	 * @param int    $orderId //订单id
-	 * @param int    $buyerId // 买家id
-	 * @param int    $storeId // 店铺id
-	 * @param string $orderSn //订单号
-	 * @param int    $money //订单金额
+	 * @param int    $orderId   //订单id
+	 * @param int    $buyerId   // 买家id
+	 * @param int    $storeId   // 店铺id
+	 * @param string $orderSn   //订单号
+	 * @param int    $money     //订单金额
+	 * @param string $orderName //订单名称
+	 * @param int    $orderType //订单类型
 	 * @return mixed
 	 * @author Administrator
 	 */
@@ -34,7 +36,9 @@ interface BillInterface{
 		int $buyerId,
 		int $storeId,
 		string $orderSn,
-		int $money
+		int $money,
+		string $orderName,
+		int $orderType
 	);
 
     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 deferGetCraftsmenById(int $storeId, int $cmanId)
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
+ * @method ResultInterface deferSyncItems(int $storeId, array $itemIds, int $mode)
  */
 interface CraftsmanInterface
 {
@@ -74,4 +75,14 @@ interface CraftsmanInterface
      */
     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;
 
+use App\Exception\ServiceException;
 use Swoft\Core\ResultInterface;
 
 /**
@@ -25,126 +26,128 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferAdminCountActivity($storeId)
  * @method ResultInterface deferGetTopThreeSales($storeId)
  * @method ResultInterface deferGetReturnVisitByGoodsIds($storeId, $goodsIds)
+ * @method ResultInterface deferCountEvaluate($storeId, $time)
+ * @method ResultInterface deferFind($storeId, $id)
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  */
 interface GoodsInterface
 {
 
-    /**
-     * 获取商品
-     * @param $storeId
-     * @return [
-     *                'gcId'   商品类ID
-     *                'asId'   服务ID
-     *                'stock'  库存
-     *                'name'   名称
-     *                'image'  图片
-     *                'price'  价格
-     *                'state'  状态
-     *                'body'   描述
-     *                'originalPrice'  原价
-     *                'sales'  销量
-     *                ]
-     * @param $id
-     * @return mixed
-     * @author Administrator
-     */
-    public function get($storeId, $id);
-
-
-    /**
-     * 增加商品销量
-     * 减少商品库存
-     * @param $storeId
-     * @param $goodsId
-     * @return mixed
-     * @author Administrator
-     */
-    public function incSales($storeId, $goodsId);
-
-    /**
-     * 减少商品销量
-     * 增加商品库存
-     * @param $storeId
-     * @param $goodsId
-     * @return mixed
-     * @author Administrator
-     */
-    public function decSales($storeId, $goodsId);
-
-
-    /**
-     * 获取商品服务
-     * @param $storeId
-     * @param $goodsId
-     * @param $type 1 付款后 2 服务前 3 服务后
-     * @return mixed
-     * @author Administrator
-     */
-    public function getServiceByGoodsId($storeId, $goodsId, $type = 3);
-
-
-    /**
-     * 获取用户回访
-     * @param $storeId
-     * @param $goodsId
-     * @param $type 1 之前 2 之后
-     * @return mixed
-     * @author Administrator
-     */
-    public function getReturnVisitByGoodsId($storeId, $goodsId, $type = 2);
-
-    /**
-     * 获取商品列表 ids
-     * @param $ids
-     * @param $storeId
-     * @param $order
-     * @return mixed
-     * @author Administrator
-     */
-    public function listByIds(array $ids, $storeId, $order = ['id', 'DESC']);
-
-    /**
-     * 获取sku信息
-     * @param $skuId
-     * @param $goodsId
-     * @param $storeId
-     * @return mixed
-     * @author work
-     */
-    public function getSkuInfo($skuId, $goodsId, $storeId);
-
-    /**
-     * 获取多个sku信息
-     * @param $goodsId
-     * @param $skuIds
-     * @return mixed
-     * @author work
-     */
-    public function getSkuByIds($goodsId, $skuIds, $storeId);
-
-
-    public function getSkuByGoodsId($goodsId, $storeId);
-
-
-    /**
-     * 获取商品规格属性
-     * @param $goodsId
-     * @param $storeId
-     * @return mixed
-     * @author work
-     */
-    public function getSpecAttributeByGoodsId($goodsId, $storeId);
-
-
-    /**
-     * 添加后续服务模版
-     * @param $storeId
-     * @return mixed
-     * @author work
-     */
-    public function afterServiceTmp($storeId);
+	/**
+	 * 获取商品
+	 * @param $storeId
+	 * @param $id
+	 * @return [
+	 *                'gcId'   商品类ID
+	 *                'asId'   服务ID
+	 *                'stock'  库存
+	 *                'name'   名称
+	 *                'image'  图片
+	 *                'price'  价格
+	 *                'state'  状态
+	 *                'body'   描述
+	 *                'originalPrice'  原价
+	 *                'sales'  销量
+	 *                ]
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function get($storeId, $id);
+
+
+	/**
+	 * 增加商品销量
+	 * 减少商品库存
+	 * @param $storeId
+	 * @param $goodsId
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function incSales($storeId, $goodsId);
+
+	/**
+	 * 减少商品销量
+	 * 增加商品库存
+	 * @param $storeId
+	 * @param $goodsId
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function decSales($storeId, $goodsId);
+
+
+	/**
+	 * 获取商品服务
+	 * @param $storeId
+	 * @param $goodsId
+	 * @param $type 1 付款后 2 服务前 3 服务后
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function getServiceByGoodsId($storeId, $goodsId, $type = 3);
+
+
+	/**
+	 * 获取用户回访
+	 * @param $storeId
+	 * @param $goodsId
+	 * @param $type 1 之前 2 之后
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function getReturnVisitByGoodsId($storeId, $goodsId, $type = 2);
+
+	/**
+	 * 获取商品列表 ids
+	 * @param $ids
+	 * @param $storeId
+	 * @param $order
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function listByIds(array $ids, $storeId, $order = ['id', 'DESC']);
+
+	/**
+	 * 获取sku信息
+	 * @param $skuId
+	 * @param $goodsId
+	 * @param $storeId
+	 * @return mixed
+	 * @author work
+	 */
+	public function getSkuInfo($skuId, $goodsId, $storeId);
+
+	/**
+	 * 获取多个sku信息
+	 * @param $goodsId
+	 * @param $skuIds
+	 * @return mixed
+	 * @author work
+	 */
+	public function getSkuByIds($goodsId, $skuIds, $storeId);
+
+
+	public function getSkuByGoodsId($goodsId, $storeId);
+
+
+	/**
+	 * 获取商品规格属性
+	 * @param $goodsId
+	 * @param $storeId
+	 * @return mixed
+	 * @author work
+	 */
+	public function getSpecAttributeByGoodsId($goodsId, $storeId);
+
+
+	/**
+	 * 添加后续服务模版
+	 * @param $storeId
+	 * @return mixed
+	 * @author work
+	 */
+	public function afterServiceTmp($storeId);
 
 	/**
 	 * 获取商品数量
@@ -175,4 +178,12 @@ interface GoodsInterface
 	 * @author work
 	 */
 	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