全额和补差升级都要校验总pv是否有问题

common/models/forms/DeclarationUpgradeForm.php

@@ -112,7 +112,6 @@ class DeclarationUpgradeForm extends Model
             if(!$this->decLv){
                 throw new Exception('请选择升级级别');
             }
-            // 用户当前总报单业绩之和
             $baseInfo = Info::baseInfoZhByUserName($this->insertUserName);
             $userId = $baseInfo['ID'];
             $userDecPvSum = User::sumDevPvByUserId($userId); // 用户所有报单PV总和
@@ -123,7 +122,8 @@ class DeclarationUpgradeForm extends Model
             $observe = Config::getConfigByType('observe'); // 获取观察期配置信息
             $observeLimit = $observe['observePeriodLimit']['value']; // 月份限制
             $isObserve = User::checkIsObserve($baseInfo['CREATED_AT'], $observeLimit); // 判断用户是否再观察期中
-            $diffPerf = $isObserve ? $this->nowPerf : 0; // 观察期内升级要加上用户累计的PV,全额则基础PV为0,全额购买
+            // $diffPerf = $isObserve ? $this->nowPerf : 0; // 观察期内升级要加上用户累计的PV,全额则基础PV为0,全额购买
+            $diffPerf = $this->nowPerf;
             if ($this->decWay != 2) {
                 throw new Exception('升级方式不正确，请联系客服人员');
             }

frontendApi/modules/v1/controllers/UserController.php

@@ -244,15 +244,13 @@ class UserController extends BaseController {
         $levelPerf = $userDecInfo['PERF'];// 用户当前级别对应的业绩值
         if (!$isMax) {
             $userDecPvSum = User::sumDevPvByUserId($userId); // 用户所有报单PV总和
-            $hasFullUpgrade = DecOrder::find()->select('UPGRADE_TYPE')->where('TO_USER_ID=:TO_USER_ID AND UPGRADE_TYPE=2', ['TO_USER_ID'=>$userId])->asArray()->one();
-            // 如果用户已全额升级过,则不校验用户的累计业绩.
             // 如果总和小于级别业绩
-            if (empty($hasFullUpgrade) && ($userDecPvSum < $levelPerf)) {
+            if ($userDecPvSum < $levelPerf) {
                 return static::notice('请联系客服人员核对业绩',400);
             }
             $nextLevelPerf = DeclarationLevel::getNextDecPref($levelPerf)['PERF'];
             // 如果总和超过了下一级业绩
-            if (empty($hasFullUpgrade) && ($userDecPvSum >= $nextLevelPerf)) {
+            if ($userDecPvSum >= $nextLevelPerf) {
                 return static::notice('请联系客服人员核对业绩',400);
             }
             $type = $isObserve ? 1 : 2;