免费续期活动

app-hd/controllers/ConsoleController.php

@@ -29,9 +29,10 @@ class ConsoleController extends BaseController
         $current = time();
         $remain = strtotime($deadline) - $current;
         if ($remain <= 1296000) {
-
+            //是否参加过免费续期活动
+            $rechargeRenew = $this->sjExtend['rechargeRenew'] ?? 2;
             $parentId = $sj['parentId'] ?? 0;
-            if (!empty($parentId)) {
+            if (!empty($parentId) && $rechargeRenew == 1) {
                 $title = '您的试用期已到，点击免费续期1年';
                 if ($remain > 0) {
                     $num = ceil($remain / 86400);

app-hd/controllers/SjController.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace hd\controllers;
+
+use Yii;
+use common\components\util;
+
+class SjController extends BaseController
+{
+
+}

biz/sj/classes/SjClass.php

@@ -43,14 +43,14 @@ class SjClass extends BaseClass
 
         $event = '购买续期';
         if ($type == 1) {
+        } elseif ($type == 2) {
+            $event = "充值花款" . $params['amount'] . "元续期 充值订单号：" . $params['orderSn'];
             $sjExt = MerchantExtendClass::getByMerchantId($sjId, true);
             if (empty($sjExt)) {
                 util::fail('没有找到商家拓展信息');
             }
             $sjExt->rechargeRenew = 2;
             $sjExt->save();
-        } elseif ($type == 2) {
-            $event = "充值花款" . $params['amount'] . "元续期 充值订单号：" . $params['orderSn'];
         } else {
             util::fail('未知续期方式');
         }