升级分期商品修改

common/models/forms/DeclarationUpgradeForm.php

@@ -478,16 +478,18 @@ class DeclarationUpgradeForm extends Model
 
     // 判断要升级的会员,是否已是最高级别
     public function alreadyMaxDec($attribute) {
-        // 如果商品是分期商品,则不判断是否已经顶级
-        if (!$this->instalment || !$this->isMax) {
-            $baseInfo = Info::baseInfoZhByUserName($this->insertUserName);
-            $userDecId = $baseInfo['DEC_LV'];// 用户当前的级别
-            $maxPerfInfo = DeclarationLevel::getMaxDecPref();
-            $maxDecId = $maxPerfInfo['ID']; // 级别配置中最高级别ID
-            $this->maxLv = $maxPerfInfo['ID'];
-            if ($maxDecId == $userDecId) {
-                $this->addError($attribute, 'It is already the highest level and no upgrade is required');//已是最高级别，无需升级
-                return false;
+        $baseInfo = Info::baseInfoZhByUserName($this->insertUserName);
+        $userDecId = $baseInfo['DEC_LV'];// 用户当前的级别
+        $maxPerfInfo = DeclarationLevel::getMaxDecPref();
+        $maxDecId = $maxPerfInfo['ID']; // 级别配置中最高级别ID
+        $this->maxLv = $maxPerfInfo['ID'];
+        if ($this->isMax) {
+            // 如果商品是分期商品,则不判断是否已经顶级
+            if (!$this->instalment) {
+                if ($maxDecId == $userDecId) {
+                    $this->addError($attribute, 'It is already the highest level and no upgrade is required');//已是最高级别，无需升级
+                    return false;
+                }
             }
         }
 

frontendApi/modules/v1/controllers/UserController.php

@@ -270,7 +270,6 @@ class UserController extends BaseController {
             }
         }
 
-
         // 如果用户已经是最高级别,则只展示用户信息
         $userInfo = [
             'DEC_NAME' => $baseInfo['DEC_LV_NAME'], // 用户级别中文
@@ -280,6 +279,7 @@ class UserController extends BaseController {
             'IS_OBSERVE' => $isObserve, // 是否是观察期  true为是观察期
             'IS_MAX' => $isMax, // 是否已是最大级别 最大级别不需要判断报单总PV是多少 只展示基本信息
             'INSTALMENT' => $instalment,
+            'NOW_PERF' => User::sumDevPvByUserId($userId), // 用户所有报单PV总和
         ];
 
         // 如果是最高级别了,则无需升级