车房奖金隐藏、绩效奖相关

frontendApi/modules/v1/controllers/BonusController.php

@@ -198,7 +198,7 @@ class BonusController extends BaseController {
      */
     public function actionWalletFlow(){
         $walletType = \Yii::$app->request->get('walletType');
-        if(!in_array($walletType,['bonus', 'cash', 'exchange', 'prp'/**, 'tourism_points', 'garage_points', 'villa_points'*/])) {
+        if(!in_array($walletType,['bonus', 'cash', 'exchange', 'prp'])) {
             return static::notice('walletType error',400);
         }
 
@@ -247,13 +247,6 @@ class BonusController extends BaseController {
                 'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
                 'orderBy' => 'CREATED_AT DESC,SORT DESC',
             ]);
-//        }elseif ($walletType == 'point'){
-//            $dealLists = FlowReconsumePoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
-//            $data = FlowReconsumePoints::lists($condition, $params, [
-//                'useSlaves' => true,
-//                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
-//                'orderBy' => 'CREATED_AT DESC',
-//            ]);
         }elseif ($walletType == 'cash'){
             $data = FlowWallet::lists($condition, $params, [
                 'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,PERIOD_NUM,CALC_MONTH,CREATED_AT',
@@ -266,27 +259,6 @@ class BonusController extends BaseController {
                 'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
                 'orderBy' => 'CREATED_AT DESC',
             ]);
-//        } else if ($walletType == 'tourism_points') {
-//                $dealLists = FlowTourismPoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
-//                $data = FlowTourismPoints::lists($condition, $params, [
-//                    'useSlaves' => true,
-//                    'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
-//                    'orderBy' => 'CREATED_AT DESC',
-//                ]);
-//        } else if ($walletType == 'garage_points') {
-//            $dealLists = FlowGaragePoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
-//            $data = FlowGaragePoints::lists($condition, $params, [
-//                'useSlaves' => true,
-//                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
-//                'orderBy' => 'CREATED_AT DESC',
-//            ]);
-//        } else if ($walletType == 'villa_points') {
-//            $dealLists = FlowVillaPoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
-//            $data = FlowVillaPoints::lists($condition, $params, [
-//                'useSlaves' => true,
-//                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
-//                'orderBy' => 'CREATED_AT DESC',
-//            ]);
         }else if ($walletType == 'prp') {
             $dealLists = FlowExchangePoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID', [':USER_ID' => \Yii::$app->user->id])->asArray()->all();
             $data = FlowExchangePoints::lists($condition, $params, [
@@ -306,14 +278,12 @@ class BonusController extends BaseController {
                     } else {
                         $data['list'][$key]['DEAL_TYPE_NAME'] = DealType::getAllTypesForShow()[$value['DEAL_TYPE_ID']]['TYPE_NAME'] ?? '';
                     }
+                    
                     if ($value['REMARK_IS_SHOW'] == 0) $data['list'][$key]['REMARK'] = '';
-                    $data['list'][$key]['REMARK'] = str_replace("车房养老奖", "福利积分一", $data['list'][$key]['REMARK']);
-                    $data['list'][$key]['REMARK'] = str_replace("领袖分红奖", "福利积分二", $data['list'][$key]['REMARK']);
-                    $data['list'][$key]['REMARK'] = str_replace("车房养老", "福利积分一", $data['list'][$key]['REMARK']);
-                    $data['list'][$key]['REMARK'] = str_replace("领袖分红", "福利积分二", $data['list'][$key]['REMARK']);
                 }
             }
         }
+
         if($dealLists){
             foreach ($dealLists as $key=>$value){
                 if(!$value['DEAL_TYPE_ID']) continue;
@@ -327,8 +297,10 @@ class BonusController extends BaseController {
                 }
             }
         }
+
         $data['dealTypes'] = $dealTypes;
         unset($dealTypes);
+
         return static::notice($data);
     }