Merge branch 'master' into dev

biz-hd/recharge/classes/RechargeClass.php

@@ -303,6 +303,7 @@ class RechargeClass extends BaseClass
             'relateId' => $relateId,
             'onlinePay' => $onlinePay,
             'capitalType' => $capitalType,
+            'giveAmount' => $balanceGive,
             'amount' => $totalBalance,
             'balance' => $hd->balance,
             'io' => 1,

biz/shop/classes/ShopExtClass.php

@@ -322,7 +322,6 @@ class ShopExtClass extends BaseClass
             $actPrice = $recharge->amount ?? 0;
             $payWay = $recharge->payWay ?? 0;
             $sound = $payWay == 0 ? "微信充值{$actPrice}元，" : "支付宝充值{$actPrice}元";
-            $sound = $sound . "，谢谢惠顾，欢迎下次光临";
             $url = "https://speaker.17laimai.cn/notify.php?id={$shopExt->lbSn}&token=HK1626595800&version={$shopExt->lbVersion}&message=" . $sound;
             $curl = new curl\Curl();
             $curl->get($url);