Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test

UPGRADE_2.x.md

+# 2.0.46
+- 修复发通知bug
+
 # 2.0.44
 # 2.0.44
 - VIP保赚服务上线
 - VIP保赚服务上线
 
 

src/MemberCard/Enum/UpBonusEvent.php

@@ -2,7 +2,9 @@
 namespace  Hdll\Services\MemberCard\Enum;
 namespace  Hdll\Services\MemberCard\Enum;
 
 
 class UpBonusEvent {
 class UpBonusEvent {
-        const  CONSUME_ADD = 1;   //消费产生积分（确认收货）
+        const  CONSUME_ADD = 1;   //消费产生积分（支付成功时）
         const  CONSUME_PAY = 2;     //下单减积分
         const  CONSUME_PAY = 2;     //下单减积分
-        const  CLOSE_ORDER = 3;   //关闭订单返还积分
+        const  REFUND_SUBORDER =3; //子订单退款
+        const  CLOSE_ORDER = 4;   //关闭订单返还积分
+        const  CLEARD = 5; // 发生了2和4之后，2--》5
 }
 }
\ No newline at end of file

src/MemberCard/Lib/MemberCardInterface.php

@@ -27,8 +27,10 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferIfCouponSuitOrder(int $storeId,int $userId,int $couponId,array $goods)
  * @method ResultInterface deferIfCouponSuitOrder(int $storeId,int $userId,int $couponId,array $goods)
  * @method ResultInterface deferUpMembercardBonus(int $storeId,int $userId,int $orderId,int $type,int $money=0,int $bonus=0)
  * @method ResultInterface deferUpMembercardBonus(int $storeId,int $userId,int $orderId,int $type,int $money=0,int $bonus=0)
  * @method ResultInterface deferUpMembercardBalance(int $storeId,int $escrow,int $userId,int $balance)
  * @method ResultInterface deferUpMembercardBalance(int $storeId,int $escrow,int $userId,int $balance)
- * @method ResultInterface deferGetBonusConvertMoney((int $storeId,int $userId,int $bonusToUse)
- * @method ResultInterface deferVerifyBonusConvertMoney((int $storeId,int $userId,int $bonusToUse,int $price)
+ * @method ResultInterface deferGetBonusConvertMoney(int $storeId,int $userId,int $bonusToUse)
+ * @method ResultInterface deferVerifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price)
+ * @method ResultInterface deferGetUserBonus(int $storeId,int $userId)
+ * @method ResultInterface deferAddOemCardPics(int $oemId)
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -129,9 +131,9 @@ interface MemberCardInterface
    *
    *
    * @param integer $storeId
    * @param integer $storeId
    * @param integer $userId
    * @param integer $userId
-   * @param integer $orderId
-   * @param integer $type   //类型 1 消费产生积分 2 积分抵扣 3订单关闭 （这里只要传1-3)  枚举见 UpBonusEvent
-   * @param integer $money  //类型1 只要传money，bonus不传；  类型2 money=0，bonus 传；   类型3 money，bonus都不传
+   * @param integer $orderId  //传的需要是主订单id
+   * @param integer $type   //类型 1 消费产生积分 2 积分抵扣  3退款扣除积分   4订单关闭 （这里只要传1-4）（这里只要传1-4)  枚举见 UpBonusEvent
+   * @param integer $money  //类型1 只要传money，bonus不传；  类型2 money=0，bonus 传；类型3 money传，bonus不传；   类型4 money，bonus都不传;
    * @param integer $bonus
    * @param integer $bonus
    * @return bool
    * @return bool
    */
    */
@@ -168,4 +170,23 @@ interface MemberCardInterface
    * @return bool  //验证通过返回true，不通过返回false
    * @return bool  //验证通过返回true，不通过返回false
    */
    */
   public function verifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price);
   public function verifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price);
+
+  /**
+   * 查询用户的会员卡积分
+   *
+   * @param integer $storeId
+   * @param integer $userId
+   * @return array       //['bonus'=>0,'recordNum'=>0]
+   */
+  public function getUserBonus(int $storeId,int $userId);
+  
+
+  /**
+   * 添加oem微信卡券相关图片素材（copy oem=0的，每增加一个oem调用一次）
+   *
+   * @param integer $oemId
+   * @return bool or Exception
+   */
+  public function addOemCardPics(int $oemId);
+
 }
 }

src/Notice/Extensions/Notice/MpSender.php

@@ -45,7 +45,7 @@ class MpSender implements SenderInterface
 		];
 		];
 		//小程序跳转（优先）
 		//小程序跳转（优先）
 		if (isset($this->miniprogram['page'])) {
 		if (isset($this->miniprogram['page'])) {
-			$this->data[$this->sendType]['pagepath'] = WxMiniNotice::generatePage(
+			$this->data[$this->sendType]['miniprogram']['pagepath'] = WxMiniNotice::generatePage(
 				$this->miniprogram['page'],
 				$this->miniprogram['page'],
 				$this->miniprogram['param']
 				$this->miniprogram['param']
 			);
 			);

src/Recharge/Lib/RechargeInterface.php

@@ -20,7 +20,7 @@ use Swoft\Core\ResultInterface;
  * @method  ResultInterface deferReturnCardMoney(int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney, int $parentOrderId)
  * @method  ResultInterface deferReturnCardMoney(int $storeId,int $buyerId,int $itemOrderId,string $itemTitle,int $payMoney, int $parentOrderId)
  * @method  ResultInterface deferStatisNum(int $storeId)
  * @method  ResultInterface deferStatisNum(int $storeId)
  * @method  ResultInterface deferGetRecharge(int $storeId, int $buyerId)
  * @method  ResultInterface deferGetRecharge(int $storeId, int $buyerId)
- * @method  ResultInterface deferDeductMoney($storeId, $buyerId, $name, $phone, $money, $message)
+ * @method  ResultInterface deferDeductMoney($storeId, $buyerId, $name, $phone, $money, $message, $escrow)
  */
  */
 interface RechargeInterface
 interface RechargeInterface
 {
 {
@@ -98,9 +98,10 @@ interface RechargeInterface
      * @param $phone
      * @param $phone
      * @param $money
      * @param $money
      * @param $message
      * @param $message
+     * @param $escrow
      * @return mixed
      * @return mixed
      */
      */
-    public function deductMoney($storeId, $buyerId, $name, $phone, $money, $message);
+    public function deductMoney($storeId, $buyerId, $name, $phone, $money, $message, $escrow);
 }
 }
 
 
 
 

src/TimesCard/Lib/TimesCardInterface.php

@@ -22,7 +22,7 @@ use Swoft\Core\ResultInterface;
  * @method  ResultInterface defergetTimesCardUserCardInfo(int $storeId, int $goodsId)
  * @method  ResultInterface defergetTimesCardUserCardInfo(int $storeId, int $goodsId)
  * @method  ResultInterface deferStatisNum(int $storeId)
  * @method  ResultInterface deferStatisNum(int $storeId)
  * @method  ResultInterface deferValidNum(int $storeId, int $buyerId)
  * @method  ResultInterface deferValidNum(int $storeId, int $buyerId)
- * @method  ResultInterface deferDeductCard($storeId, $buyerId, $items)
+ * @method  ResultInterface deferDeductCard($storeId, $buyerId, $name, $phone, $items)
  */
  */
 interface TimesCardInterface
 interface TimesCardInterface
 {
 {