root пре 2 година
родитељ
комит
dd510fd437

+ 58 - 12
backendApi/modules/v1/models/lists/finance/BalanceAuditList.php

@@ -206,18 +206,64 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
             $this->filterTypes = [
                 'USER_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListUserName')], //会员编号
                 'REAL_NAME' => ['isUserTable' => false, 'name' =>  Yii::t('ctx', 'memberName')], //会员姓名
-                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListMemberLevel'), 'other' => 'decLevel'], // 会员级别
-                'LAST_DEC_ROLE_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListStockistLevel'), 'other' => 'decRole'], // 报单中心级别
-                'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListEmpLevel'), 'other' => 'empLevel'], // 聘级
-                'TYPE_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListTypeName'), 'other' => 'select', 'selectData' => Tool::formatFilter(BalanceAudit::TYPE, 'name', 'label')], // 账户类型
-                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListDealType'), 'other' => 'select', 'selectData' => Tool::formatFilter(DealType::getAllTypesForShow(), 'ID', 'TYPE_NAME')], // 交易类型
-                'AMOUNT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAmount')], // 调整金额
-                'CREATE_REMARK' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemark')], // 备注
-                'REMARK_IS_SHOW' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemarkIsShow'), 'other' => 'yesOrNo'], // 前台是否显示备注
-                'CREATE_ADMIN_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListApplicant')], // 申请人
-                'CREATED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListCreatedAt'), 'other' => 'date'], // 申请时间
-                'AUDIT_ADMIN_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditName')], // 审核人
-                'AUDITED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditTime'), 'other' => 'date'], // 审核时间
+                'LAST_DEC_LV_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListMemberLevel'), 
+                    'other' => 'decLevel'
+                ], // 会员级别
+                'LAST_DEC_ROLE_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListStockistLevel'), 
+                    'other' => 'decRole'
+                ], // 报单中心级别
+                'LAST_EMP_LV_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListEmpLevel'), 
+                    'other' => 'empLevel'
+                ], // 聘级
+                'TYPE_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListTypeName'), 
+                    'other' => 'select', 
+                    'selectData' => Tool::formatFilter(BalanceAudit::getBalanceAuditType(), 'name', 'label')
+                ], // 账户类型
+                'DEAL_TYPE_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListDealType'), 
+                    'other' => 'select', 
+                    'selectData' => Tool::formatFilter(DealType::getAllTypesForShow(), 'ID', 'TYPE_NAME')
+                ], // 交易类型
+                'AMOUNT' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAmount')
+                ], // 调整金额
+                'CREATE_REMARK' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemark')
+                ], // 备注
+                'REMARK_IS_SHOW' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemarkIsShow'), 
+                    'other' => 'yesOrNo'
+                ], // 前台是否显示备注
+                'CREATE_ADMIN_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListApplicant')
+                ], // 申请人
+                'CREATED_AT' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListCreatedAt'), 
+                    'other' => 'date'
+                ], // 申请时间
+                'AUDIT_ADMIN_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditName')
+                ], // 审核人
+                'AUDITED_AT' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditTime'), 
+                    'other' => 'date'
+                ], // 审核时间
             ];
         }
         return $this->filterTypes;

+ 4 - 0
common/messages/en-US/ctx.php

@@ -100,6 +100,10 @@ return [
     'shopOrderListGetOrderStatusOrderDeletion' => 'Order deletion',
     'shopOrderListGetOrderStatusOrderDeletionOrderRefund' => 'Order refund',
     'shopOrderListGetOrderStatusPaymentFailed' => 'Payment failed',
+    'balanceAuditListGetBalanceAuditType' => 'Member bonus account',
+    'balanceAuditListCash' => 'Member Ecoin account',
+    'balanceAuditListGaragePoints' => 'Car points',
+    'balanceAuditListVillaPoints' => 'Villa points',
 
     'memberEcoinAdjustmentListFileName'=> 'Member_Ecoin_adjustment_list',
     'applicationChangeBalanceSucceeded'=> 'Application for change of member balance succeeded',

+ 5 - 1
common/messages/zh-CN/ctx.php

@@ -89,6 +89,10 @@ return [
     'rechargeRechargeStateNew'=>'New',
     'rechargeRechargeStateProcessing'=>'Processing',
     'rechargeRechargeStateSuccess'=>'Success',
+    'balanceAuditListGetBalanceAuditType' => '会员账户奖金',
+    'balanceAuditListCash' => '会员账户余额',
+    'balanceAuditListGaragePoints' => '车奖积分',
+    'balanceAuditListVillaPoints' => '房奖积分',
 
     'memberEcoinAdjustmentListFileName'=> '会员余额调整列表',
     'applicationChangeBalanceSucceeded'=> '申请变动会员余额成功',
@@ -410,7 +414,7 @@ return [
 
     # 会员
     'memberCode' => '会员编号',
-    'memberName' => '会员名',
+    'memberName' => '会员名',
     'memberAddress' => '收货地址',
     'loginStatus' => '登录状态',
     'allowLogin' => '允许登录',

+ 41 - 0
common/models/BalanceAudit.php

@@ -175,4 +175,45 @@ class BalanceAudit extends \common\components\ActiveRecord
             ],
         ];
     }
+
+    public static function getBalanceAuditType() {
+        return [
+            'bonus' => [
+                'name' => 'bonus',
+                'label' => \Yii::t('ctx', 'balanceAuditListGetBalanceAuditType'),//会员账户奖金
+            ],
+    //        'reconsume_points' => [
+    //            'name' => 'reconsume_points',
+    //            'label' => '复消积分',
+    //        ],
+    //        'exchange_points' => [
+    //            'name' => 'exchange_points',
+    //            'label' => '兑换积分',
+    //        ],
+            'cash' => [
+                'name' => 'cash',
+                'label' => \Yii::t('ctx', 'balanceAuditListCash'),// 会员账户余额
+            ],
+    //        'cf' => [
+    //            'name' => 'cf',
+    //            'label' => '车房养老奖余额',
+    //        ],
+    //        'lx' => [
+    //            'name' => 'lx',
+    //            'label' => '领袖分红奖余额',
+    //        ],
+    //        'tourism_points' => [
+    //            'name' => 'tourism_points',
+    //            'label' => '旅游积分',
+    //        ],
+            'garage_points' => [
+                'name' => 'garage_points',
+                'label' => \Yii::t('ctx', 'balanceAuditListGaragePoints'),// 车奖积分
+            ],
+            'villa_points' => [
+                'name' => 'villa_points',
+                'label' => \Yii::t('ctx', 'balanceAuditListVillaPoints'),// 房奖积分
+            ],
+        ];
+    }
 }