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

UPGRADE_2.x.md

+# 2.0.62
+- 流量平台-分享达人
+
+# 2.0.61
+- 流量平台-上线修复
+
+# 2.0.60
+- 流量平台
+
 # 2.0.59
 # 2.0.59
 - oem免费vip
 - oem免费vip
 
 

src/Auth/Enum/AuthEnum.php

@@ -19,6 +19,7 @@ class AuthEnum
     const SCOPE_OEMADM = 3.1; //oem管理员
     const SCOPE_OEMADM = 3.1; //oem管理员
     const SCOPE_SALESMAN = 3.2; //流量平台业务员
     const SCOPE_SALESMAN = 3.2; //流量平台业务员
     const SCOPE_TRAFFIC_SELLER = 3.3; //流量平台商家
     const SCOPE_TRAFFIC_SELLER = 3.3; //流量平台商家
+    const SCOPE_SHARER_TALENT = 3.4; //流量平台分享达人
 
 
     const SCOPE_ADMIN  =  4;//管理员
     const SCOPE_ADMIN  =  4;//管理员
     const SCOPE_SUPER_ADMIN = 5; //超级管理员
     const SCOPE_SUPER_ADMIN = 5; //超级管理员
@@ -38,6 +39,7 @@ class AuthEnum
     const AUTH_TYPE_SALESMAN = 206; // 流量平台业务员
     const AUTH_TYPE_SALESMAN = 206; // 流量平台业务员
     const AUTH_TYPE_TRAFFIC_BUYER = 207; // 流量平台的买家
     const AUTH_TYPE_TRAFFIC_BUYER = 207; // 流量平台的买家
     const AUTH_TYPE_TRAFFIC_SELLER = 208; // 流量平台的商家
     const AUTH_TYPE_TRAFFIC_SELLER = 208; // 流量平台的商家
+    const AUTH_TYPE_SHARER_TALENT = 209; // 流量平台的分享达人
 
 
 
 
 
 

src/Order/Lib/OrderInterface.php

@@ -33,6 +33,8 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferOrderCountByCondition(int $storeId,array $condition)
  * @method ResultInterface deferOrderCountByCondition(int $storeId,array $condition)
  * @method ResultInterface deferBuyerSpendAmount(int $storeId,int $buyerId)
  * @method ResultInterface deferBuyerSpendAmount(int $storeId,int $buyerId)
  * @method ResultInterface deferBanchGetShopStByDate(array $storeIds,int $date)
  * @method ResultInterface deferBanchGetShopStByDate(array $storeIds,int $date)
+ * @method ResultInterface deferGetReceiverLog($storeId, $tradeSn)
+ * @method ResultInterface deferPostagePaySuccess(int $storeId, array $payData)
  */
  */
 interface OrderInterface
 interface OrderInterface
 {
 {
@@ -245,4 +247,21 @@ interface OrderInterface
      * ]
      * ]
      */
      */
     public function banchGetShopStByDate(array $storeIds,int $date);
     public function banchGetShopStByDate(array $storeIds,int $date);
+
+    /**
+     * 查询订单收货人修改记录
+     * @param int $storeId
+     * @param string $tradeSn
+     * @return array
+     */
+    public function getReceiverLog($storeId, $tradeSn);
+
+    /**
+     * 运费补差价支付成功回调
+     *
+     * @param int $storeId
+     * @param array $payData
+     * @return void
+     */
+    public function postagePaySuccess(int $storeId, array $payData);
 }
 }
\ No newline at end of file

src/V2/Common/Config/CfgCenter.php

@@ -174,7 +174,8 @@ class CfgCenter
 		if($database == '') {
 		if($database == '') {
 			$database = 'config_center';
 			$database = 'config_center';
 		}
 		}
-		if (\env('APP_DEV') == 'prod') {
+
+		if (\env('APP_ENV') == 'prod') {
 			// 返回线上数据库连接
 			// 返回线上数据库连接
 			return new \Medoo\Medoo([
 			return new \Medoo\Medoo([
 				'database_type' => 'mysql',
 				'database_type' => 'mysql',