Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Common/Pool/Config/CommentsPoolConfig.php

UPGRADE_2.x.md

+# 2.0.41
+- 会员卡修复bug
+
+# 2.0.40
+- 添加评论服务的poolConfig
+
 # 2.0.39
 # 2.0.39
 - 评论上线
 - 评论上线
 
 

src/Common/Pool/Config/CommentsPoolConfig.php

@@ -14,6 +14,8 @@ use Swoft\Bean\Annotation\Bean;
 use Swoft\Pool\PoolProperties;
 use Swoft\Pool\PoolProperties;
 
 
 /**
 /**
+ * the config of service craftsman
+ *
  * @Bean()
  * @Bean()
  */
  */
 class CommentsPoolConfig extends PoolProperties
 class CommentsPoolConfig extends PoolProperties
@@ -24,7 +26,7 @@ class CommentsPoolConfig extends PoolProperties
         $this->uri = explode(',', env('RPC_COMMENTS_URI', 'comments:8099'));
         $this->uri = explode(',', env('RPC_COMMENTS_URI', 'comments:8099'));
     }
     }
 
 
-    protected $name = 'coupon';
+    protected $name = 'comments';
 
 
     /**
     /**
      * Minimum active number of connections
      * Minimum active number of connections

src/MemberCard/Lib/MemberCardInterface.php

@@ -20,7 +20,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferPayOrder(int $storeId,string $orderSn,int $payStatus)
  * @method ResultInterface deferPayOrder(int $storeId,string $orderSn,int $payStatus)
  * @method ResultInterface deferGetOrder(int $storeId,int $id)
  * @method ResultInterface deferGetOrder(int $storeId,int $id)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
  * @method ResultInterface deferGetOrderBySn(int $storeId,string $sn)
- * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId)
+ * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId,int $escrow)
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -71,7 +71,8 @@ interface MemberCardInterface
    *
    *
    * @param integer $storeId
    * @param integer $storeId
    * @param integer $userId
    * @param integer $userId
-   * @return void
+   * @param integer $escrow
+   * @return bool
    */
    */
-   public function ifUserGetCard(int $storeId,int $userId);
+  public function ifUserGetCard(int $storeId,int $userId,int $escrow);
 }
 }