Merge branch 'ft-catering'

src/Auth/Enum/AuthEnum.php

@@ -41,7 +41,8 @@ class AuthEnum
     const AUTH_TYPE_TRAFFIC_SELLER = 208; // 流量平台的商家
     const AUTH_TYPE_SHARER_TALENT = 209; // 流量平台的分享达人
 
-
+    const APP_TYPE_REGISTER = 1; // 店铺注册专用小程序
+    const APP_TYPE_CATERING = 2; // 餐饮行业店铺管理小程序
 
 
 

src/Common/Bean/Annotation/Auth.php

@@ -21,6 +21,8 @@ class Auth
 
     private $option='==';
 
+    private $allowTourist=false;
+
     public function __construct(array $values)
     {
 
@@ -31,6 +33,10 @@ class Auth
         if (isset($values['option'])) {
             $this->option = $values['option'];
         }
+
+        if (isset($values['allowTourist'])) {
+            $this->allowTourist = $values['allowTourist'];
+        }
     }
 
 
@@ -53,4 +59,24 @@ class Auth
     {
         return $this->option;
     }
+
+    /**
+     * Get the value of allowTourist
+     */ 
+    public function getAllowTourist()
+    {
+        return $this->allowTourist;
+    }
+
+    /**
+     * Set the value of allowTourist
+     *
+     * @return  self
+     */ 
+    public function setAllowTourist($allowTourist)
+    {
+        $this->allowTourist = $allowTourist;
+
+        return $this;
+    }
 }
\ No newline at end of file

src/Common/Bean/Collector/AuthCollector.php

@@ -26,12 +26,15 @@ class AuthCollector implements CollectorInterface
         if ($objectAnnotation instanceof Auth) {
             $scope = $objectAnnotation->getScope();
             $option = $objectAnnotation->getOption();
+            $allowTourist = $objectAnnotation->getAllowTourist();
             if ( $methodName ==='' ) {
                 self::$auth[$className]['scope'] = $scope;
                 self::$auth[$className]['option'] = $option;
+                self::$auth[$className]['allowTourist'] = $allowTourist;
             } else {
                 self::$auth[$className]['methods'][$methodName]['scope'] = $scope;
                 self::$auth[$className]['methods'][$methodName]['option'] = $option;
+                self::$auth[$className]['methods'][$methodName]['allowTourist'] = $allowTourist;
             }
         }
 

src/Common/Config/CfgCenter.php

@@ -31,7 +31,8 @@ class CfgCenter
 	const TRAFFIC_BACKEND_WEAPP  = 'traffic_backend_weapp'; //流量平台业务员端小程序
 	const TRAFFIC_FRONTEND_WEAPP = 'traffic_frontend_weapp'; //流量平台买家端小程序
 	const CATERING_WEAPP = 'catering_weapp'; //餐饮小程序
-
+	const REGISTER_WEAPP = 'register_weapp'; // 注册店铺专用小程序
+	
 	/**
 	 * 根据用户token获取配置, 优先使用此方法读取配置
 	 * 用法：

src/Order/Enum/OrderEnum.php

@@ -13,7 +13,9 @@ class OrderEnum
     const STATUS_CANCEL = 0; //已取消
     const STATUS_UNPAID = 10; //待支付
     const STATUS_PAID = 20; //已支付
-    const STATUS_DELIVERY = 30; //已发货|已预约
+    const STATUS_TAKE_ORDER = 21; //卖家已接单
+    const STATUS_WAIT_DLV = 22; //待取货
+    const STATUS_DELIVERY = 30; //已发货|配送中|已预约
     const STATUS_ARRIVED = 31;  //已送达
     const STATUS_DELIVERED = 40; //已收获|已核销
     const STATUS_REFUND = 50; //申请退款
@@ -26,6 +28,8 @@ class OrderEnum
     //支付后的所有状态数组
     const PAID_STATUS  = [
         self::STATUS_PAID,
+        self::STATUS_TAKE_ORDER,
+        self::STATUS_WAIT_DLV,
         self::STATUS_DELIVERY,
         self::STATUS_ARRIVED,
         self::STATUS_REFUND,
@@ -37,6 +41,7 @@ class OrderEnum
     //订单类别
     const CLASS_SERVICE = 1;//服务类
     const CLASS_PHYSICAL = 2;//实物类
+    const CLASS_CATERING = 3;//餐饮类
 
     //订单类型
     const TYPE_GOODS = 0; //商品订单
@@ -73,7 +78,11 @@ class OrderEnum
     const REFUND_REJECTED = 3; //拒绝退款
     const REFUND_REVOKE = 4; //买家撤销退款
 
+    const DLV_SEND = 1; //餐饮订单交货方式：配送
+    const DLV_SELF_TAKE = 2; //餐饮订单交货方式：自提
 
+    const SEND_TYPE_3RD = 1; //配送方式：第三方配送公司
+    const SEND_TYPE_SELF = 2; //配送方式：商家自己配送
 
 
 }
\ No newline at end of file

src/Order/Enum/PayOriginEnum.php

@@ -11,4 +11,6 @@ class PayOriginEnum
     const BUYER_MP = 6;//买家公众号
     const QUICKPAY_H5 = 7;// h5页面快速支付
     const YUNMAIKJ_MP = 8; // 云脉科技公众号支付
+    const CATERING_BUYER_WEAPP = 9; // 餐饮行业买家端小程序
+    const CATERING_SELLER_WEAPP = 10; // 餐饮行业商家小程序
 }
\ No newline at end of file

src/Order/Lib/OrderInterface.php

@@ -22,7 +22,6 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoByIds(int $storeId,array $orderIds, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoByPids(int $storeId,array $pIds,array $updateInfo)
- * @method ResultInterface deferUpdateMainOrderByPid(int $storeId,int $pId,array $mainData,array $subData=[])
  * @method ResultInterface deferUnconfirmedCount(int $storeId)
  * @method ResultInterface deferGetSubOrderListBySubIds(int $storeId,array $ids,int $arg=1)
  * @method ResultInterface deferOrderCount(int $storeId,int $orderType,array $itemIds)
@@ -149,7 +148,7 @@ interface OrderInterface
      * @param array $subData
      * @return bool
      */
-    public function payCallback(int $storeId,int $pId,array $mainData,array $subData=[]);
+    public function payCallback(int $storeId,int $pId,array $mainData,array $subData);
     
     /**
      * 获取未入账统计

src/Store/Enum/StoreEnum.php

@@ -9,4 +9,7 @@ class StoreEnum
 
 	const VIP_TYPE_TY = 'ty'; // 特殊VIP类型：免费体验
 
+	const INDUSTRY_BEAUTY = 1; //店铺行业：美业
+	const INDUSTRY_CATERING = 2; //店铺行业：餐饮
+	const INDUSTRY_ESHOP = 3; //店铺行业：电商
 }
\ No newline at end of file

src/Wx3rd/Lib/EntrustedInterface.php

@@ -46,6 +46,26 @@ interface EntrustedInterface
     public function getEntAccessToken($storeId);
 
     /**
+     * 获取托管小程序的订阅消息模板
+     * @param int $storeId
+     * @param int $tid 模板编号，产品原型图上会给出
+     * @return array
+     */
+    public function getNoticeTemplate(int $storeId, int $tid);
+    
+    /**
+     * 给托管的小程序发送订阅消息
+     *
+     * @param integer $tid
+     * @param integer $storeId
+     * @param integer $buyerId
+     * @param array $tplData
+     * @param array $pageParams
+     * @return void
+     */
+    public function sendSubscribeMessage(int $tid, int $storeId, int $buyerId, array $tplData, array $pageParams=[]);
+
+    /**
      * 根据店铺id和商户平台id获取对应的支付证书
      * 
      * @param int $storeId