Explorar o código

feat: UN-71: 会员-奖金列表调整

kevin hai 1 ano
pai
achega
2c3ec69b9d
Modificáronse 1 ficheiros con 3 adicións e 12 borrados
  1. 3 12
      frontendApi/modules/v1/controllers/BonusController.php

+ 3 - 12
frontendApi/modules/v1/controllers/BonusController.php

@@ -108,23 +108,15 @@ class BonusController extends BaseController {
     public function actionTeams() {
         $userId = \Yii::$app->user->id;
         $period = Period::instance();
-//        $periodNum = $period->getNowPeriodNum();
-//        $month = $period->getNowYearMonth();
         // 查询最新一期已封期、未挂网期数
         $periodNum = $period->getTeamsPeriodNum();
         $month = $period->getTeamsYearMonth($periodNum);
 
-        // 判断此业绩期是否已经完成生成了预计算业绩单,生成完毕才能看到
-        $isPerfed = Period::checkPerf($periodNum);
-        LoggerTool::debug(['calc-1', $isPerfed, $periodNum]);
-        if (!$isPerfed) {
-            return static::notice(['user' => [],'team'=>[]]);
-        }
-        // 判断当前时间,是否临近封期,否则隐藏
-        LoggerTool::debug(['calc-2']);
-        if ($periodNum % 2!=0) {
+        // 判断此业绩期是否已经计算完成
+        if ($period['IS_PREPARE'] != 4) {
             return static::notice(['user' => [],'team'=>[]]);
         }
+
         $userInfo = User::getEnCodeInfo($userId);
         $data = PerfMonth::fetchMonthPerf($month, $userId);
         $user[0] = [
@@ -146,7 +138,6 @@ class BonusController extends BaseController {
         }
         $teamInfo = [];
         $calcAt = PerfMonth::find()->select(['CREATED_AT'])->where('CALC_MONTH=:CALC_MONTH', ['CALC_MONTH'=>$month])->asArray()->one();
-        LoggerTool::debug(['calc-3']);
         if(!$calcAt){
             $periodStartTime = $period->nowPeriodArr['START_TIME'];
             return static::notice(['user' => $user,'team'=>[],'calcAt' => $periodStartTime]);