Merge branch 'ft-membercard-oem' into ft-bonus

UPGRADE_2.x.md

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

src/MemberCard/Lib/MemberCardInterface.php

@@ -30,6 +30,7 @@ use Swoft\Core\ResultInterface;
  * @method ResultInterface deferGetBonusConvertMoney(int $storeId,int $userId,int $bonusToUse)
  * @method ResultInterface deferGetBonusConvertMoney(int $storeId,int $userId,int $bonusToUse)
  * @method ResultInterface deferVerifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price)
  * @method ResultInterface deferVerifyBonusConvertMoney(int $storeId,int $userId,int $bonusToUse,int $price)
  * @method ResultInterface deferGetUserBonus(int $storeId,int $userId)
  * @method ResultInterface deferGetUserBonus(int $storeId,int $userId)
+ * @method ResultInterface deferAddOemCardPics(int $oemId)
  */
  */
 /**
 /**
  * The interface of demo service
  * The interface of demo service
@@ -179,4 +180,12 @@ interface MemberCardInterface
    */
    */
   public function getUserBonus(int $storeId,int $userId);
   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']
 			);
 			);