Merge branch 'xmy' of http://git.dev.2b3.cn/tencent/services into xmy

src/Bargain/Lib/BargainInterface.php

@@ -18,6 +18,7 @@ use Swoft\Core\ResultInterface;
  *
  * @method  ResultInterface deferGetgoodsinfo(int $limit_id)
  * @method  ResultInterface deferGetBargainInfo(int $limit_id)
+ * @method  ResultInterface deferGetBargainCounts(int $storeId)
  */
 interface BargainInterface
 {
@@ -61,6 +62,14 @@ interface BargainInterface
         int $bargainbranchId,
         int $status ,  //
         int $orderId);
+
+  /**
+     * 获取砍价活动总个数 和正在进行的个数
+     *
+     * @return mixed
+     */
+    public function getBargainCounts(int $storeId);
+        
 }
 
 

src/Cmq/Topic.php

@@ -259,9 +259,14 @@ class Topic
 		$tryTimes = 0;
 
 		do {
-			$res = $this->publish_message($cryptMessage, $vTagList, $routingKey);
+			try {
+				$res = $this->publish_message($cryptMessage, $vTagList, $routingKey);
+				if($res['code'] == 0) break;
+			} catch(\Throwable $e) {
+				App::error("[消息队列异常]:".var_export($e, true));
+			}
 			$tryTimes++;
-		} while ($res['code'] != 0 && $tryTimes < 3);
+		} while ($tryTimes < 3);
 
 		if ($tryTimes >= 3) {
 			App::error("[消息队列失败]:$message");

src/Goods/Lib/GoodsInterface.php

@@ -22,6 +22,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetSkuByGoodsId($goodsId, $storeId)
  * @method ResultInterface deferGetSpecAttributeByGoodsId($goodsId, $storeId)
  * @method ResultInterface deferAfterServiceTmp($storeId)
+ * @method ResultInterface deferAdminCountActivity($storeId)
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  */
@@ -142,4 +143,16 @@ interface GoodsInterface
      * @author work
      */
     public function afterServiceTmp($storeId);
+
+	/**
+	 * 获取商品数量
+	 * [
+	 *      'total'=>1,
+	 *      'online'=>1
+	 * ]
+	 * @param $storeId
+	 * @return mixed
+	 * @author work
+	 */
+	public function adminCountGoods($storeId);
 }

src/GroupBooking/Lib/GroupBookingInterface.php

@@ -13,6 +13,7 @@ use Swoft\Core\ResultInterface;
 /**
  * @method ResultInterface deferPaySuccess($orderId)
  * @method ResultInterface deferHasActivity($storeId,$goodsId)
+ * @method ResultInterface deferAdminCountActivity($storeId)
  * Interface GoodsInterface
  * @package Hdll\Services\Goods\Lib
  */
@@ -33,4 +34,16 @@ interface GroupBookingInterface{
 	 * @author Administrator
 	 */
 	public function closeRecord($storeId, $buyerId, $orderId);
+
+	/**
+	 * 获取所有活动数量
+	 * [
+	 *      'total'=>1,
+	 *      'online'=>1
+	 * ]
+	 * @param $storeId
+	 * @return mixed
+	 * @author work
+	 */
+	public function adminCountActivity($storeId);
 }
\ No newline at end of file

src/LimitTimeBuy/Lib/LimitTimeBuyInterface.php

@@ -17,6 +17,7 @@ use Swoft\Core\ResultInterface;
  * The interface of demo service
  *
  * @method  ResultInterface deferBackNum(string $token, int $consignee_id, int $limit_id, int $selected_num, int $order_type, int $goods_id, string $reservation_time = '')
+ *  @method  ResultInterface deferGetLimitCounts(int $storeId)
  */
 interface LimitTimeBuyInterface
 {
@@ -81,4 +82,11 @@ interface LimitTimeBuyInterface
         int $limit_id,
         int $status,
         int $orderId);
+
+    /**
+     * 获取限时购活动总个数 和正在进行的个数
+     *
+     * @return mixed
+     */
+    public function getLimitCounts(int $storeId);
 }
\ No newline at end of file

src/Seller/Lib/SellerInterface.php

@@ -22,6 +22,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferSaveRelation($sellerId)
  * @method ResultInterface deferUpdateRelationVip($sellerId, $isVip)
  * @method ResultInterface deferCountVip($sellerId, $isVip)
+ * @method ResultInterface deferCountSeller($start, $end)
+ *
  * Interface SellerInterface
  * @package App\Lib
  */
@@ -93,4 +95,6 @@ interface SellerInterface
 	public function updateRelationVip($sellerId, $isVip);
 
 	public function countVip($sellerId);
+
+	public function countSeller($start, $end);
 }
\ No newline at end of file

src/SellerDistribution/Lib/SellerDistributionInterface.php

@@ -20,6 +20,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferRefundAddBalance($sellerId, $money, $orderSn = '')
  * @method ResultInterface deferCountVip($storeId, $sellerId)
  * @method ResultInterface deferSumViewMoneyByStoreIds(array $storeIds)
+ * @method ResultInterface deferSumBillMoney()
  * Interface SellerDistributionInterface
  * @package App\Lib
  */
@@ -126,5 +127,10 @@ interface SellerDistributionInterface
 	 */
 	public function sumViewMoneyByStoreIds(array $storeIds);
 
-
+	/**
+	 * vip分销佣金总金额
+	 * @return mixed
+	 * @author work
+	 */
+	public function sumBillMoney();
 }
\ No newline at end of file

src/Store/Lib/StoreInterface.php

@@ -26,6 +26,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferUpdateStore(int $storeId, array $data)
  * @method ResultInterface deferAddVipTime(int $storeId, int $days)
  * @method ResultInterface deferDeleteStore(int $storeId)
+ * @method ResultInterface deferGetStoreCount(int $startTime, int $endTime, $edition=null)
  * @method ResultInterface deferGetWxacodeUrl(int $storeId, int $type, string $page, string $scene)
  */
 interface StoreInterface
@@ -149,4 +150,14 @@ interface StoreInterface
      */
     public function getWxacodeUrl(int $storeId, int $type, string $page, string $scene);
 
+    /**
+     * 获取指定时间段内的有效店铺数量
+     *
+     * @param integer $startTime
+     * @param integer $endTime
+     * @param integer $edition
+     * @return integer
+     */
+    public function getStoreCount(int $startTime, int $endTime, $edition=null);
+
 }
\ No newline at end of file