Merge branch 'master' into dev

app-hd/controllers/NoticeController.php

@@ -3,6 +3,7 @@
 namespace hd\controllers;
 
 use biz\common\classes\GhsNotifyClass;
+use biz\renew\classes\RenewClass;
 use biz\shop\classes\ShopClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\custom\classes\CustomRechargeClass;
@@ -564,6 +565,20 @@ class NoticeController extends PublicController
             }
             Yii::$app->redis->executeCommand('SETEX', [$cacheKey, 864000, 'has']);
 
+            // 花店续费（xhRenew）支付成功通知
+            if ($capitalType == dict::getDict('capitalType', 'xhRenew', 'id')) {
+                $renew = RenewClass::getByCondition(['orderSn' => $orderSn], true);
+                $sjName = !empty($renew) ? (string) ($renew->sjName ?? '') : '';
+                $shopName = !empty($renew) ? (string) ($renew->shopName ?? '') : '';
+                $renewName = ($shopName === '' || $shopName === '首店')
+                    ? $sjName
+                    : trim($sjName . ' ' . $shopName);
+                if ($renewName === '') {
+                    $renewName = (string) $orderSn;
+                }
+                noticeUtil::push('花店：' . $renewName . '，续费成功', '15280215347');
+            }
+
             //零售采购结账通知
             if ($capitalType == dict::getDict('capitalType', 'xhPurchase', 'id')) {
                 $cg = PurchaseClass::getByCondition(['orderSn' => $orderSn], true);

app-hd/controllers/RenewController.php

@@ -14,6 +14,7 @@ use bizHd\user\services\UserService;
 use bizHd\wx\classes\WxOpenClass;
 use common\components\dict;
 use common\components\httpUtil;
+use common\components\noticeUtil;
 use common\components\util;
 use Yii;
 
@@ -161,6 +162,14 @@ class RenewController extends BaseController
                 'capitalType=' . dict::getDict('capitalType', 'xhRenew', 'id') . '&applyId=' . $attachApplyId,
                 ''
             );
+            // 0 元续费当场完成，不走微信支付回调，此处补发成功通知
+            $renewName = $shopName == '首店' || $shopName === ''
+                ? $sjName
+                : trim($sjName . ' ' . $shopName);
+            if ($renewName === '') {
+                $renewName = (string) $this->shopId;
+            }
+            noticeUtil::push('花店：' . $renewName . '，续费成功', '15280215347');
             util::success([
                 'needPay' => 0,
                 'paid' => 1,

common/components/dict.php

@@ -740,7 +740,7 @@ class dict
             ['id' => 5, 'name' => '其它'],
         ],
         'hdRegisterConfig' => [
-            'price' => 0.02, //花店开通费用
+            'price' => 980, //花店开通费用
             'commissionAmount' => 88.00, //默认分佣金额 (默认)
             'hdDiscountAmount' => 88.00 //花店优惠金额 (默认)
         ]