Merge branch 'master' into dev

biz/renew/classes/RenewClass.php

@@ -49,30 +49,28 @@ class RenewClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $before = $shop->deadline ?? '';
         $beforeTime = strtotime($before);
-        if ($renew->type == 1) {
-            //首次续费，赠送一个月
-            //$time = $beforeTime + 34128000;
-            $time = $beforeTime + 31536000;
+        if ($renew->type == 2) {
+            //购买设备，不需要有操作
         } else {
             //每次续费一年
             $time = $beforeTime + 31536000;
-        }
-        $newDate = date("Y-m-d H:i:s", $time);
+            $newDate = date("Y-m-d H:i:s", $time);
 
-        $renew->payTime = date("Y-m-d H:i:s");
-        $renew->status = 1;
-        $renew->deadline = $newDate;
-        $renew->beforeDeadline = $before;
-        $renew->save();
+            $renew->payTime = date("Y-m-d H:i:s");
+            $renew->status = 1;
+            $renew->deadline = $newDate;
+            $renew->beforeDeadline = $before;
+            $renew->save();
 
-        $shopList = ShopClass::getAllByCondition(['mainId' => $mainId], null, '*', null, true);
-        if (!empty($shopList)) {
-            foreach ($shopList as $myShop) {
-                $myShop->beforeDeadline = $before;
-                $myShop->deadline = $newDate;
-                $myShop->hasRenew = 1;
-                $myShop->needRenew = 0;
-                $myShop->save();
+            $shopList = ShopClass::getAllByCondition(['mainId' => $mainId], null, '*', null, true);
+            if (!empty($shopList)) {
+                foreach ($shopList as $myShop) {
+                    $myShop->beforeDeadline = $before;
+                    $myShop->deadline = $newDate;
+                    $myShop->hasRenew = 1;
+                    $myShop->needRenew = 0;
+                    $myShop->save();
+                }
             }
         }
 

common/components/book.php

@@ -99,7 +99,6 @@ class book
             ['style' => 'info', 'value' => '软件年费1580元，年费需每年付一次，客户通过小程序下单，会扣0.33手续费，即100元扣3毛3。',],
             ['style' => 'info', 'value' => '根据你自身门店情况，选择以下套餐。下面列出的套餐，已经过全国200家鲜花批发店和11万家花店磨合使用，非常成熟好用，请放心购买使用，以下套餐已含第一年年费。',],
             ['style' => 'miniTitle', 'value' => '软件的研发成本巨大，不管是年费、费率和套餐，都已经底价，没有商量的空间，请理解。付费后不支持退货。',],
-            ['style' => 'info', 'value' => '首次开通系统，另外赠送30天有效期，保证有足够时间试运营。',],
             ['style' => 'info', 'value' => '提供上门培训服务，培训时间3天，需报销差旅住宿费用，公司地址在福建厦门。',],
             ['style' => 'smallTitle', 'value' => '仓库版',],
             ['style' => 'info', 'value' => '整套软件功能（一年）',],