修改是否是观察期的判断

common/models/User.php

@@ -351,7 +351,7 @@ class User extends \common\components\ActiveRecord
         $lastDay = date("t", strtotime($appendMonth));  // 获取指定月的最后一天
         $eTime = strtotime($appendMonth.'-'.$lastDay);
 
-        return $addAt < $eTime ? true : false;
+        return time() < $eTime ? true : false;
     }
 
     // 获取用户报单PV总和

common/models/forms/DeclarationUpgradeForm.php

@@ -170,7 +170,7 @@ class DeclarationUpgradeForm extends Model
                 // 这里特殊是用户原报单PV之和+用户购买的商品总PV
                 $totalPv = $totalPv + $diffPerf;
                 if($totalPv < $decLevel['PERF']) {
-                    throw new Exception('自选商品总PV不能小于所选级别PV');
+                    throw new Exception('总PV不能小于所选级别PV');
                 }
                 foreach ($decLevelConfig as $key=>$val){
                     if($totalPv>=$val['PERF']){
@@ -178,7 +178,7 @@ class DeclarationUpgradeForm extends Model
                     }
                 }
                 if($this->decLv!=$toDecLevel){
-                    throw new Exception('自选商品总PV不能超过已选级别下一个级别的PV值');
+                    throw new Exception('总PV不能超过已选级别下一个级别的PV值');
                 }
                 $this->_decAmount = $totalAmount;
                 $this->_decPv = $totalPv;

frontendApi/modules/v1/controllers/UserController.php

@@ -219,6 +219,7 @@ class UserController extends BaseController {
         $observe = Config::getConfigByType('observe'); // 获取观察期配置信息
         $observeLimit = $observe['observePeriodLimit']['value']; // 月份限制
         $isObserve = User::checkIsObserve($baseInfo['CREATED_AT'], $observeLimit); // 判断用户是否再观察期中
+        // var_dump($isObserve);exit;
         // 如果用户已经是最高级别,则只展示用户信息
         $isMax = false;
         if ($maxDecId == $userDecId) {