Merge branch 'master' into dev

app-hd/controllers/NoticeController.php

@@ -576,7 +576,8 @@ class NoticeController extends PublicController
                 if ($renewName === '') {
                     $renewName = (string) $orderSn;
                 }
-                noticeUtil::push('花店：' . $renewName . '，续费成功', '15280215347');
+                $renewAmount = !empty($renew) ? ($renew->actPrice ?? $totalFee) : $totalFee;
+                noticeUtil::push('零售花店：' . $renewName . '，续费金额：' . $renewAmount . '，续费成功', '15280215347');
             }
 
             //零售采购结账通知

app-hd/controllers/RenewController.php

@@ -169,7 +169,7 @@ class RenewController extends BaseController
             if ($renewName === '') {
                 $renewName = (string) $this->shopId;
             }
-            noticeUtil::push('花店：' . $renewName . '，续费成功', '15280215347');
+            noticeUtil::push('零售花店：' . $renewName . '，续费金额：' . $actPrice . '，续费成功', '15280215347');
             util::success([
                 'needPay' => 0,
                 'paid' => 1,