Merge branch 'master' of http://git.0x00day.com:10080/hdll/hdll-services

src/Auth/Enum/AuthError.php

@@ -9,7 +9,10 @@ namespace Hdll\Services\Auth\Enum;
 
 class AuthError
 {
+    const PARAMETER_ERR = ["msg" => "参数错误", "code" => 500, "errorCode" => 25001];
+
     const TOKEN_ERROR = ["msg" => "token写入失败", "code" => 500, "errorCode" => 25100];
+
     const WX_ERROR = ["msg" => "获取信息失败", "code" => 500, "errorCode" => 25101];
     const CONFIG_ERROR = ["msg" => "配置不正确", "code" => 500, "errorCode" => 25102];
     const GET_TOKEN_ERROR = ["msg" => "获取token失败", "code" => 500, "errorCode" => 25103];

src/Buyer/Enum/BuyerEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/7/30
+ * Time: 11:34
+ */
+namespace Hdll\Services\Buyer\Enum;
+
+class BuyerEnum
+{
+    const SCORE = 0;
+
+}
\ No newline at end of file

src/Buyer/Enum/BuyerError.php

@@ -12,6 +12,7 @@ class BuyerError
     const PARAMETER_ERR = ["msg" => "参数错误", "code" => 400, "errorCode" => 24001];
     const REGISTERED = ["msg" => "用户已存在,无需创建", "code" => 400, "errorCode" => 24101];
     const DB_ERROR = ["msg" => "数据库操作错误", "code" => 500, "errorCode" => 24102];
+    const SCORE_ERR = ["msg" => "你无权创建该用户", "code" => 403, "errorCode" => 24103];
 
 
     public static function atranslate($message,$param)

src/Common/Pool/Config/SellerDistributionPoolConfig.php

@@ -78,7 +78,7 @@ class SellerDistributionPoolConfig extends PoolProperties
      * @var array
      */
     protected $uri = [
-        '192.168.3.100:8100',
+        '192.168.3.39:8100',
     ];
 
     /**

src/Common/Pool/Config/SellerPoolConfig.php

@@ -78,7 +78,7 @@ class SellerPoolConfig extends PoolProperties
      * @var array
      */
     protected $uri = [
-        '192.168.3.100:8099',
+        '192.168.3.39:8099',
     ];
 
     /**

src/FlowMetering/Lib/FlowMeteringInterface.php

+<?php
+/**
+ * This file is part of Swoft.
+ *
+ * @link https://swoft.org
+ * @document https://doc.swoft.org
+ * @contact group@swoft.org
+ * @license https://github.com/swoft-cloud/swoft/blob/master/LICENSE
+ */
+
+namespace Hdll\Services\FlowMetering\Lib;
+
+use Swoft\Core\ResultInterface;
+
+/**
+ * The interface of demo service
+ *
+ * @method ResultInterface deferOrderMark(string $token, int $orderType, int $orderId, float $money)
+
+ */
+interface FlowMeteringInterface
+{
+    /**
+     * @param string $token
+     * @param int $orderType
+     * @param int $orderId
+     * @param float $money
+     * @return mixed
+     */
+
+    public function OrderMark(
+        string $token,
+        int $orderType,
+        int $orderId,
+        float $money);
+}
\ No newline at end of file

src/Seller/Enum/SellerError.php

@@ -6,7 +6,7 @@
  * Time: 14:19
  */
 
-namespace Hdll\Services\Order\Enum;
+namespace Hdll\Services\Seller\Enum;
 
 class SellerError
 {

src/Seller/Lib/SellerInterface.php

@@ -6,13 +6,14 @@
  * Time: 16:28
  */
 
-namespace Hdll\Services\Store\Lib;
+namespace Hdll\Services\Seller\Lib;
 
 use Swoft\Core\ResultInterface;
 
 /**
  * @method ResultInterface deferSave($referId, $unionId, $openId, $nickName, $headImgUrl, $realName, $phoneNumber)
- * @method ResultInterface deferGet($id)
+ * @method ResultInterface deferGet($id,$fields=['*'])
+ * @method ResultInterface deferUpdate($id)
  * Interface SellerInterface
  * @package App\Lib
  */
@@ -33,10 +34,26 @@ interface SellerInterface
 	public function save($referId, $unionId, $openId, $nickName, $headImgUrl, $realName = '', $phoneNumber = '');
 
 	/**
-	 * @param $id
+	 * @param       $id
+	 * @param array $fields
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function get($id);
+	public function get($id,$fields=['*']);
+
+	/**
+	 * @param $condition
+	 * @param $data
+	 * $data['referId']=>'来源ID'
+	 * $data['unionId']=>'unionId'
+	 * $data['openId']=>'openId'
+	 * $data['nickName']=>'昵称'
+	 * $data['headImgUrl']=>'头像URL'
+	 * $data['realName']=>'真实姓名'
+	 * $data['phoneNumber']=>'手机号'
+	 * @return mixed
+	 * @author Administrator
+	 */
+	public function update($condition,$data);
 
 }
\ No newline at end of file

src/SellerDistribution/Enum/SellerDistributionError.php

@@ -6,7 +6,7 @@
  * Time: 14:19
  */
 
-namespace App\Exception;
+namespace Hdll\Services\SellerDistribution\Enum;
 
 class SellerDistributionError
 {

src/SellerDistribution/Lib/SellerDistributionInterface.php

@@ -5,7 +5,7 @@
  * Date: 2018/7/25
  * Time: 14:00
  */
-namespace App\Lib;
+namespace Hdll\Services\SellerDistribution\Lib;
 use Swoft\Core\ResultInterface;
 
 /**