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

src/Cmq/Topic.php

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

src/Order/Lib/OrderInterface.php

@@ -28,6 +28,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferOrderCount(int $storeId,int $orderType,array $itemIds)
  * @method ResultInterface deferOrderCount(int $storeId,int $orderType,array $itemIds)
  * @method ResultInterface deferAddShopsDailyStatistic(int $storeId,int $pId)
  * @method ResultInterface deferAddShopsDailyStatistic(int $storeId,int $pId)
  * @method ResultInterface deferGetShopStatistic(int $storeId)
  * @method ResultInterface deferGetShopStatistic(int $storeId)
+ * @method ResultInterface deferGetShopDailyStatistic(int $storeId,int $startDate,int $endDate)
  */
  */
 interface OrderInterface
 interface OrderInterface
 {
 {
@@ -184,4 +185,15 @@ interface OrderInterface
      * @return array
      * @return array
      */
      */
     public function getShopStatistic(int $storeId);
     public function getShopStatistic(int $storeId);
+
+    /**
+     * 指定时间（段）查询店铺交易统计
+     * 
+     * 
+     * @param integer $storeId
+     * @param integer $startDate
+     * @param integer $endDate
+     * @return array
+     */
+    public function getShopDailyStatistic(int $storeId,int $startDate,int $endDate);
 }
 }
\ 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 deferRefundAddBalance($sellerId, $money, $orderSn = '')
  * @method ResultInterface deferCountVip($storeId, $sellerId)
  * @method ResultInterface deferCountVip($storeId, $sellerId)
  * @method ResultInterface deferSumViewMoneyByStoreIds(array $storeIds)
  * @method ResultInterface deferSumViewMoneyByStoreIds(array $storeIds)
+ * @method ResultInterface deferSumBillMoney()
  * Interface SellerDistributionInterface
  * Interface SellerDistributionInterface
  * @package App\Lib
  * @package App\Lib
  */
  */
@@ -126,5 +127,10 @@ interface SellerDistributionInterface
 	 */
 	 */
 	public function sumViewMoneyByStoreIds(array $storeIds);
 	public function sumViewMoneyByStoreIds(array $storeIds);
 
 
-
+	/**
+	 * vip分销佣金总金额
+	 * @return mixed
+	 * @author work
+	 */
+	public function sumBillMoney();
 }
 }
\ No newline at end of file