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

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

kevin 1 год назад
Родитель
Сommit
e59c6bd57f

+ 0 - 9
backendApi/modules/v1/controllers/BonusController.php

@@ -2072,17 +2072,8 @@ class BonusController extends BaseController {
             'USER_NAME' => 'UI.USER_NAME',
             'REAL_NAME' => 'UI.REAL_NAME',
             'userIds' => 'UB.USER_ID',
-            'BONUS' => 'BONUS',
-//            'RECONSUME_POINTS' => 'RECONSUME_POINTS',
-            'CASH' => 'CASH',
             'IS_DEC' => 'UI.IS_DEC',
             'PERIOD_AT' => 'UI.PERIOD_AT',
-            'MOBILE' => 'UI.MOBILE',
-            'TEL' => 'UI.TEL',
-//            'CF' => 'CF',
-//            'LX' => 'LX',
-//            'HIGHEST_EMP_LV_NAME' => 'UI.HIGHEST_EMP_LV',
-//            'SYSTEM_NAME' => 'UI.SYSTEM_ID',
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];

+ 0 - 16
backendApi/modules/v1/models/lists/bonus/BalanceList.php

@@ -137,17 +137,6 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                         'tag'=>['type'=>'danger', 'size' => 'small', 'class'=>'no-border'],
                     ],
                 ],
-                'PERIOD_AT' => [
-                    'header' =>\Yii::t('ctx', 'joiningPeriod'), // 加入期数
-                    'headerOther' => ['width' => '110'],
-                ],
-                'MOBILE' => [
-                    'header' => \Yii::t('ctx', 'phoneNumber'), // 手机号码
-                    'value' => function($row) {
-                        return "\t".$row['MOBILE'];
-                    },
-                    'headerOther' => ['width' => '120'],
-                ],
             ];
         }
         return $this->columns;
@@ -164,11 +153,6 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                 'USER_NAME'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'memberCode')], // 会员编号
                 'REAL_NAME'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'memberName')], // 会员姓名
                 'IS_DEC'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'whetherStockist'), 'other'=> 'yesOrNo'], // 是否报单中心
-                'BONUS'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'memberBonus')], // 会员奖金余额
-                'CASH'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'memberEcoin')], // 会员余额
-                'PERIOD_AT'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'joiningPeriod')], // 加入期数
-                'MOBILE'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'phoneNumber')], // 手机号码
-                'TEL'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'alternatePhoneNumber')], // 备用手机号码
             ];
         }
         return $this->filterTypes;