Merge remote-tracking branch 'origin/test' into test

UPGRADE_2.x.md

+# 2.0.35
+- 增加rpc接口
+
 # 2.0.34
 # 2.0.34
 - 会员卡接口
 - 会员卡接口
 
 

src/Common/Config/CfgCenter.php

@@ -69,7 +69,7 @@ class CfgCenter
                 } else {
                 } else {
                     $val = $res[1];
                     $val = $res[1];
                 }
                 }
-                $redis->set("CONFIG_CENTER:".$res[0], $val);
+                $redis->set("CONFIG_CENTER:".$res[0], $val, 3600);
                 return $res[1];
                 return $res[1];
             }
             }
         }
         }

src/Craftsman/Lib/CraftsmanInterface.php

@@ -17,7 +17,7 @@ use Swoft\Core\ResultInterface;
  * The interface of craftsman service
  * The interface of craftsman service
  *
  *
  * @method ResultInterface deferGetCraftsmenList(int $storeId, int $subStoreId = 0, int $itemId = 0)
  * @method ResultInterface deferGetCraftsmenList(int $storeId, int $subStoreId = 0, int $itemId = 0)
- * @method ResultInterface deferGetCraftsmenByUnionId(string $unionId)
+ * @method ResultInterface deferGetCraftsmenByUnionId(string $unionId, int $isSeller=0)
  * @method ResultInterface defercreateCraftsman($storeId, array $params)
  * @method ResultInterface defercreateCraftsman($storeId, array $params)
  * @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)
@@ -72,9 +72,10 @@ interface CraftsmanInterface
      * 根据unionId获取店员信息
      * 根据unionId获取店员信息
      *
      *
      * @param string $unionId
      * @param string $unionId
+     * @param int $isSeller   是否店主 1-是 ，0-否 
      * @return array
      * @return array
      */
      */
-    public function getCraftsmenByUnionId(string $unionId);
+    public function getCraftsmenByUnionId(string $unionId, int $isSeller =0);
 
 
     
     
     /**
     /**

src/Order/Enum/OrderQueueEnum.php

@@ -11,10 +11,10 @@ class OrderQueueEnum
 {
 {
     const TOPIC = "order";
     const TOPIC = "order";
 
 
-    const UPDATE_INFO = 'update-info';
-
-    const SELLER_ORDER_UPDATE_INFO = 'updateInfoById';
+    const UPDATE_INFO = 'update-info'; //买家订单更改
 
 
+    const SELLER_ORDER_UPDATE_INFO = 'updateInfoById'; //卖家订单更改
 
 
+    const ORDER_DELIVERY = 'orderDelivery';//实物订单发货
 
 
 }
 }
\ No newline at end of file

src/Store/Lib/StoreInterface.php

@@ -22,6 +22,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetStoreBySellerId(int $sellerId)
  * @method ResultInterface deferGetStoreBySellerId(int $sellerId)
  * @method ResultInterface deferGetListBySellerIds(array $sellerIds, array $fields = [])
  * @method ResultInterface deferGetListBySellerIds(array $sellerIds, array $fields = [])
  * @method ResultInterface deferGetListByStoreIds(array $storeIds, array $fields = [])
  * @method ResultInterface deferGetListByStoreIds(array $storeIds, array $fields = [])
+ * @method ResultInterface deferGetListByLastMonth()
  * @method ResultInterface deferGetStoreByMobile(int $mobile, array $fields = [])
  * @method ResultInterface deferGetStoreByMobile(int $mobile, array $fields = [])
  * @method ResultInterface deferUpdateStore(int $storeId, array $data)
  * @method ResultInterface deferUpdateStore(int $storeId, array $data)
  * @method ResultInterface deferAddVipTime(int $storeId, int $days)
  * @method ResultInterface deferAddVipTime(int $storeId, int $days)
@@ -92,6 +93,26 @@ interface StoreInterface
     public function getListByStoreIds(array $storeIds, array $fields = []);
     public function getListByStoreIds(array $storeIds, array $fields = []);
 
 
     /**
     /**
+     * 获取最近一个月登录的店铺列表
+     *
+     * @return array
+     * array(14) {
+     *   [0]=>
+     *   array(4) {
+     *       ["id"]=>
+     *       int(11)
+     *       ["sellerId"]=>
+     *       int(8)
+     *       ["storeName"]=>
+     *       string(12) "平凡小店"
+     *       ["unionId"]=>
+     *       string(28) "ohQUyuBp5CWZjyPJEsG4znbFQIZI"
+     *   }
+     * }
+     */
+    public function getListByLastMonth();
+
+    /**
      * 根据注册手机号获取店铺信息
      * 根据注册手机号获取店铺信息
      *
      *
      * @param integer $mobile
      * @param integer $mobile