Просмотр исходного кода

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

kevin 1 год назад
Родитель
Сommit
0af3eb4a9c
1 измененных файлов с 15 добавлено и 17 удалено
  1. 15 17
      frontendApi/modules/v1/controllers/BonusController.php

+ 15 - 17
frontendApi/modules/v1/controllers/BonusController.php

@@ -468,22 +468,20 @@ class BonusController extends BaseController {
         // 增加明细开关控制(0 只显示总奖金 1 全部显示)
         $flowBonusSwitch = Cache::getSystemConfig()['flowBonusSwitch']['VALUE'];
 
-        LoggerTool::debug(['$calcBonus', $calcBonus]);
-
-        if ($calcBonus) {
-            if ($flowBonusSwitch) {
-                $flowBonusSwitch['BONUS_E'] = ['name' => 'Elite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_E'])];
-                $flowBonusSwitch['BONUS_PE'] = ['name' => 'SuperElite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_PE'])];
-                $flowBonusSwitch['BONUS_SE'] = ['name' => 'ProElite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_SE'])];
-                $flowBonusSwitch['BONUS_LB'] = ['name' => 'LeaderShip奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_LB'])];
-                $flowBonusSwitch['BONUS_ST'] = ['name' => '店铺奖', 'value' => Tool::formatPrice($calcBonus['BONUS_ST'])];
-                $flowBonusSwitch['BONUS_WB'] = ['name' => '迎新奖', 'value' => Tool::formatPrice($calcBonus['BONUS_WB'])];
-                $flowBonusSwitch['BONUS_CAR'] = ['name' => '车奖', 'value' => Tool::formatPrice($calcBonus['BONUS_CAR'])];
-                $flowBonusSwitch['BONUS_PB'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_PB'])];
-            }
-
-            $calcBonus['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
-        }
+//        if ($calcBonus) {
+//            if ($flowBonusSwitch) {
+//                $flowBonusSwitch['BONUS_E'] = ['name' => 'Elite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_E'])];
+//                $flowBonusSwitch['BONUS_PE'] = ['name' => 'SuperElite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_PE'])];
+//                $flowBonusSwitch['BONUS_SE'] = ['name' => 'ProElite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_SE'])];
+//                $flowBonusSwitch['BONUS_LB'] = ['name' => 'LeaderShip奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_LB'])];
+//                $flowBonusSwitch['BONUS_ST'] = ['name' => '店铺奖', 'value' => Tool::formatPrice($calcBonus['BONUS_ST'])];
+//                $flowBonusSwitch['BONUS_WB'] = ['name' => '迎新奖', 'value' => Tool::formatPrice($calcBonus['BONUS_WB'])];
+//                $flowBonusSwitch['BONUS_CAR'] = ['name' => '车奖', 'value' => Tool::formatPrice($calcBonus['BONUS_CAR'])];
+//                $flowBonusSwitch['BONUS_PB'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_PB'])];
+//            }
+//
+//            $calcBonus['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
+//        }
 
         return static::notice(['tableData' => [$calcBonus], 'bonusSwitch' => $flowBonusSwitch]);
     }
@@ -522,7 +520,7 @@ class BonusController extends BaseController {
     public function actionDecPeriod() {
         $showDecPeriodNum = Cache::getSystemConfig()['showDecPeriodNum']['VALUE'];
         $calcBonus = Period::find()->where('IS_SENT=:IS_SENT',[':IS_SENT' => Period::SEND_FINISH])->select('PERIOD_NUM,END_TIME')->limit($showDecPeriodNum)->orderBy('PERIOD_NUM DESC')->asArray()->all();
-        return static::notice($data);
+        return static::notice($calcBonus);
     }
 
     /**