解决冲突

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

@@ -21,9 +21,12 @@ use Swoft\Core\ResultInterface;
  * @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,int $escrow)
  * @method ResultInterface deferIfUserGetCard(int $storeId,int $userId,int $escrow)
+<<<<<<< HEAD
  * @method ResultInterface deferGetUserCouponDetail(int $storeId ,int $couponId)  
  * @method ResultInterface deferGetUserCouponDetail(int $storeId ,int $couponId)  
  * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
  * @method ResultInterface deferSetUserCouponStatus(int $storeId,int $couponId,int $status)
  *  @method ResultInterface deferGetUserValidCouponNum(int $storeId,int $escrow,int $userId)
  *  @method ResultInterface deferGetUserValidCouponNum(int $storeId,int $escrow,int $userId)
+=======
+>>>>>>> coupon
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -77,6 +80,7 @@ interface MemberCardInterface
    * @param integer $escrow
    * @param integer $escrow
    * @return bool
    * @return bool
    */
    */
+<<<<<<< HEAD
    public function ifUserGetCard(int $storeId,int $userId,int $escrow);
    public function ifUserGetCard(int $storeId,int $userId,int $escrow);
 
 
    /**
    /**
@@ -107,4 +111,7 @@ interface MemberCardInterface
    * @return int
    * @return int
    */
    */
    public function getUserValidCouponNum(int $storeId,int $escrow,int $userId);
    public function getUserValidCouponNum(int $storeId,int $escrow,int $userId);
+=======
+  public function ifUserGetCard(int $storeId,int $userId,int $escrow);
+>>>>>>> coupon
 }
 }

src/Order/Lib/OrderInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * order servcie
  * order servcie
  *
  *
- * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0,int $agentId=0);
+ * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0,int $points=0);
  * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
@@ -52,8 +52,9 @@ interface OrderInterface
      * @param integer $goodsPrice
      * @param integer $goodsPrice
      * @param string $message
      * @param string $message
      * @param integer $skuId
      * @param integer $skuId
-     * @param integer $subStoreId
-     * @param integer $couponId
+     * @param integer $subStoreId 
+     * @param integer $couponId 优惠券iD
+     * @param integer $points 积分
      * @return mixed
      * @return mixed
      */
      */
     public function createOrder(
     public function createOrder(
@@ -72,7 +73,8 @@ interface OrderInterface
         string  $message = '',
         string  $message = '',
         int     $skuId=0,
         int     $skuId=0,
         int     $subStoreId=0,
         int     $subStoreId=0,
-        int     $couponId=0
+        int     $couponId=0,
+        int     $points=0
     );
     );
     /**
     /**
     * 根据子订单ID查询订单详情
     * 根据子订单ID查询订单详情