Merge branch 'master' into dev

app-ghs/controllers/RenewController.php

@@ -90,6 +90,7 @@ class RenewController extends BaseController
         $get = Yii::$app->request->get();
         $year = $get['year'] ?? 1;
         $type = $get['type'] ?? 0;
+        $remark = $get['remark'] ?? '';
         $orderSn = orderSn::getRenewSn();
         $staff = $this->shopAdmin;
         $staffId = $staff->id ?? 0;
@@ -121,13 +122,7 @@ class RenewController extends BaseController
             if ($price <= 0) {
                 util::fail('请输入金额');
             }
-            if (getenv('YII_ENV') == 'production') {
-                $staff = $this->shopAdmin;
-                if ($price < 1580 && $staff->mobile != 15280215347) {
-                    //util::fail('金额不能低于年费');
-                }
-            }
-            $name = "购买系统";
+            $name = "购买套餐/购买设备";
         }
         $data = [
             'orderSn' => $orderSn,
@@ -146,6 +141,7 @@ class RenewController extends BaseController
             'beforeDeadline' => $beforeDeadline,
             'status' => 0,
             'type' => $type,
+            'remark' => $remark,
         ];
         $ret = RenewClass::add($data, true);
         $id = $ret->id ?? 0;