theo 3 лет назад
Родитель
Сommit
263f47e562

+ 1 - 1
backendApi/modules/v1/controllers/ShopController.php

@@ -799,7 +799,7 @@ class ShopController extends BaseController {
     }
 
     /**
-     * 订单表导出
+     * BA订单表导出
      * @return mixed
      * @throws \yii\db\Exception
      * @throws \yii\web\HttpException

+ 404 - 0
backendApi/modules/v1/models/lists/user/BaUserList.php

@@ -0,0 +1,404 @@
+<?php
+namespace backendApi\modules\v1\models\lists\user;
+
+use common\helpers\Cache;
+use common\helpers\http\BackendToFrontendApi;
+use common\helpers\user\Info;
+use common\libs\dataList\DataListInterface;
+use common\models\DecRole;
+use common\models\OpenBank;
+use common\models\Region;
+use common\models\User;
+use common\models\UserInfo;
+use common\libs\dataList\column\DateTime;
+use common\libs\dataList\column\YesNo;
+use common\models\UserNetwork;
+use common\models\UserSystem;
+use Yii;
+
+class BaUserList extends \common\libs\dataList\DataList implements DataListInterface
+{
+    /**
+     * 列表名称
+     * @return string
+     */
+    public function getListName(){
+        return '会员列表';
+    }
+
+    /**
+     * 列表筛选到的数据
+     */
+    public function dataHandle()
+    {
+        $this->condition .= ' AND UN.USER_ID=UI.USER_ID AND UN.PARENT_UID=UI.CON_UID';
+        $this->listData = User::lists($this->condition, $this->params, [
+            'select' => 'U.*,
+                UI.USER_ID, UI.ZC_PV, UI.CON_UID, UI.REC_UID, UI.CON_NUM, UI.REC_NUM, UI.NETWORK_DEEP, 
+                UI.RELATION_DEEP, UI.SYSTEM_ID, UI.IS_GROUP_LEADER, UI.IS_SYSTEM_LEADER, UI.IS_TEAM, UI.IS_BIND, 
+                UI.IS_TEAM_MAIN, UI.IS_BIND_MAIN, UI.IS_AUTO_WITHDRAW, UI.CLOSE_LOGIN, UI.REG_TYPE, UI.SHOULD_REG_TYPE, 
+                UI.REG_NAME, UI.CREDIT_CODE, UI.PREMISES, UI.LEGAL_PERSON, UI.REG_EXPIRES, UI.STORE_TYPE, UI.INVOICE_BALANCE, 
+                UI.HIGHEST_EMP_LV, UI.CLOSE_LOGIN_AT, UI.PULLED_AT, 
+                UI.GROUP_LEADER_AT, UI.ALLOW_TRANSFER, UI.ALLOW_RECONSUME_SMS, UI.ALLOW_RECONSUME_SMS_TO, 
+                UI.HIGHEST_EMP_LV_PERIOD, UI.TRANSFER_PROP, UI.LOGIN_NUMS, UI.FAIL_NUMS, UI.LAST_LOGIN_IP, 
+                UI.LAST_LOGIN_AT, UI.SHOW_EMP_LV,UN.RELATIVE_LOCATION,
+                CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME,
+                RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,
+                DU.USER_NAME DEC_USER_NAME
+                ',
+            'orderBy' => 'UI.CREATED_AT DESC, UI.ID DESC',
+            'from' => User::tableName() . ' AS U',
+            'join' => [
+                ['LEFT JOIN', UserInfo::tableName() . ' AS UI', 'UI.USER_ID=U.ID'],
+                ['LEFT JOIN', UserNetwork::tableName() . ' AS UN', 'UI.USER_ID=UN.USER_ID'],
+                ['LEFT JOIN', User::tableName() . ' AS CU', 'UI.CON_UID=CU.ID'],
+                ['LEFT JOIN', User::tableName() . ' AS RU', 'UI.REC_UID=RU.ID'],
+                ['LEFT JOIN', User::tableName() . ' AS DU', 'U.DEC_ID=DU.ID'],
+            ],
+            'page' => $this->page,
+            'pageSize' => $this->pageSize,
+        ]);
+        foreach ($this->listData['list'] as $key => $value) {
+            // 后台访问前台的请求参数
+            if (!$this->isExport && Yii::$app->user->validateAdminAction('user', 'login-to-frontend')) {
+                $urlParams = BackendToFrontendApi::paramsFormat(['id' => $value['USER_ID']]);
+                $urlParamStr = '';
+                foreach ($urlParams as $pKey => $pValue) {
+                    $urlParamStr .= $pKey . '=' . $pValue . '&';
+                }
+                $urlParamStr = substr($urlParamStr, 0, -1);
+                $this->listData['list'][$key]['BTF_URL'] = $urlParamStr;
+            } else {
+                $this->listData['list'][$key]['BTF_URL'] = null;
+            }
+        }
+    }
+
+    /**
+     * 要展示和导出的所有字段
+     * @return array
+     */
+    public function getColumn(){
+        $decLevelConfig = Cache::getDecLevelConfig();
+        $empLevelConfig = Cache::getEmpLevelConfig();
+        $crownLevelConfig = Cache::getStarCrownLevelConfig();
+        $decRoleConfig = DecRole::getAllData();
+        $systemConfig = UserSystem::getAllSystems();
+        $openBankConfig = OpenBank::getAllOpenBank();
+        $regionConfig = Cache::getRegionConfig();
+        if(!$this->columns){
+            $this->columns = [
+                'USER_ID' => null, // 这种传输方式主要是用于索引,因为过滤后的字段可能没有这种ID,但是一些功能的操作还需要用这种ID去关联,例如前台会员列表中的勾选批量状态管理,这里需要的就是USER_ID
+                'BTF_URL' => null,
+                'USER_NAME' => [
+                    'header' => 'Member Code', // 会员编号
+                    'headerOther' => ['width' => '150'],
+                ],
+                'REAL_NAME' => [
+                    'header' => 'Member Name', // 会员姓名
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                    'valueOther' => [
+                        'tag'=>['type'=>'success', 'size' => 'small', 'class'=>'no-border']
+                    ],
+                ],
+                'LOGIN_STATUS_NAME' => [
+                    'header' => 'Login Status', // 登录状态
+                    'value' => function($row) {
+                        return $row['ALLOW_LOGIN'] == 1 ? 'Allow Login': 'Prohibit Login'; // '允许登录' : '禁止登录'
+                    },
+                    'headerOther' => ['width' => '110'],
+                ],
+                'STATUS' => [
+                    'header' => 'Status', // 状态
+                    'value' => function($row) {
+                        return $row['STATUS'] == 1 ? 'Activate': 'Lock'; // '激活' : '锁定'
+                    },
+                    'headerOther' => ['width' => '110'],
+                ],
+                'ALLOW_LOGIN' => ['header' => 'Filter Allow Login','hidden'=>true], // 筛选允许登录
+                'CREATED_AT' => [
+                    'header' => 'Joining Date', // 加入日期
+                    'value' => function($row) {
+                        return (new DateTime([
+                            'value' => $row['CREATED_AT'],
+                        ]))->result();
+                    },
+                    'headerOther' => ['width' => '170'],
+                ],
+                'PERIOD_AT' => [
+                    'header' => 'Joining Period', // 加入期数
+                    'headerOther' => ['width' => '180'],
+                ],
+                'DEC_LV_NAME' => [
+                    'header' => 'Current Member Level', // 实时会员级别
+                    'headerOther' => ['width' => '160'],
+                    'value' => function($row) use($decLevelConfig) {
+                        return $decLevelConfig[$row['DEC_LV']]['LEVEL_NAME'];
+                    },
+                    'valueOther' => [
+                        'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
+                    ],
+                ],
+                'DEC_LV_UPDATED_AT' => [
+                    'header' => 'Current Adjustment Date', // 实时调整日期
+                    'value' => function($row) {
+                        return (new DateTime([
+                            'value' => $row['DEC_LV_UPDATED_AT'],
+                        ]))->result();
+                    },
+                    'headerOther' => ['width' => '180'],
+                ],
+                'LAST_DEC_LV_NAME' => [
+                    'header' => 'PC Member Level', // 结算时会员级别
+                    'headerOther' => [
+                        'width' => '140',
+                    ],
+                    'value' => function($row) use($decLevelConfig) {
+                        if (!$row['LAST_DEC_LV']) {
+                            return $decLevelConfig[$row['DEC_LV']]['LEVEL_NAME'];
+                        } else {
+                            return $decLevelConfig[$row['LAST_DEC_LV']]['LEVEL_NAME'];
+                        }
+                    },
+                    'valueOther' => [
+                        'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
+                    ],
+                ],
+                'EMP_LV_NAME' => [
+                    'header' => 'Current Director Rank', // 实时聘级
+                    'headerOther' => [
+                        'width' => '160',
+                    ],
+                    'value' => function($row) use($empLevelConfig) {
+                        return isset($empLevelConfig[$row['EMP_LV']])?$empLevelConfig[$row['EMP_LV']]['LEVEL_NAME']:'';
+                    },
+                    'valueOther' => [
+                        'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
+                    ],
+                ],
+                'CROWN_LV_NAME' => [
+                    'header' => 'Current Crown Rank', // 实时星级
+                    'headerOther' => [
+                        'width' => '150',
+                    ],
+                    'value' => function($row) use($crownLevelConfig) {
+                        return isset($crownLevelConfig[$row['CROWN_LV']])?$crownLevelConfig[$row['CROWN_LV']]['LEVEL_NAME']:'';
+                    },
+                    'valueOther' => [
+                        'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
+                    ],
+                ],
+                'REC_USER_NAME' => [
+                    'header' => 'Recommendation No', // 推荐编号
+                    'headerOther' => ['width' => '160'],
+                ],
+                'REC_REAL_NAME' => [
+                    'header' => 'Recommended Name', // 推荐姓名
+                    'headerOther' => ['width' => '160'],
+                ],
+                'CON_USER_NAME' => [
+                    'header' => 'Placement No', // 安置编号
+                    'headerOther' => ['width' => '140'],
+                ],
+                'CON_REAL_NAME' => [
+                    'header' => 'Placement Name', // 安置姓名
+                    'headerOther' => ['width' => '140'],
+                ],
+                'RELATIVE_LOCATION' => [
+                    'header' => 'Resettlement Area', // 安置区域
+                    'headerOther' => ['width' => '140'],
+                ],
+                'MOBILE' => [
+                    'header' => 'Phone Number', // 手机号码
+                    'value' => function($row) {
+                        return "\t".$row['MOBILE'];
+                    },
+                    'headerOther' => ['width' => '120'],
+                ],
+                'TEL' => [
+                    'header' => 'Alternate Phone Number', // 备用手机号码
+                    'value' => function($row) {
+                        return "\t".$row['TEL'];
+                    },
+                    'headerOther' => ['width' => '180'],
+                ],
+                'DEC_USER_NAME' => [
+                    'header' => 'Stockist Code', // 所属报单中心编号
+                    'headerOther' => ['width' => '150'],
+                ],
+                'IS_DEC' => [
+                    'header' => 'Whether Declaration Center', // 是否报单中心
+                    'value' => function($row) {
+                        return (new YesNo([
+                            'value' => $row['IS_DEC'],
+                        ]))->result();
+                    },
+                    'headerOther' => function($row) {
+                        return ['width' => '200'];
+                    },
+                    'valueOther' => function($row) {
+                        return [
+                            'tag'=>['type'=>(isset($row['IS_DEC']) && $row['IS_DEC'] )? 'success' : 'info', 'size' => 'small']
+                        ];
+                    },
+                ],
+                'IS_ATLAS' => [
+                    'header' => 'Wheter Atlas Display', // 是否显示图谱
+                    'value' => function($row) {
+                        return (new YesNo([
+                            'value' => $row['IS_ATLAS'],
+                        ]))->result();
+                    },
+                    'headerOther' => function($row) {
+                        return [
+                            'width' => '160',
+                        ];
+                    },
+                    'valueOther' => function($row) {
+                        return [
+                            'tag'=>['type'=>(isset($row['IS_ATLAS']) && $row['IS_ATLAS'] )? 'success' : 'info', 'size' => 'small']
+                        ];
+                    },
+                ],
+                'IS_RECHARGE' => [
+                    'header' => 'Wheter Recharge Display', // 是否显示充值
+                    'value' => function($row) {
+                        return (new YesNo([
+                            'value' => $row['IS_RECHARGE'],
+                        ]))->result();
+                    },
+                    'headerOther' => function($row) {
+                        return [
+                            'width' => '180',
+                        ];
+                    },
+                    'valueOther' => function($row) {
+                        return [
+                            'tag'=>['type'=>(isset($row['IS_RECHARGE']) && $row['IS_RECHARGE'] )? 'success' : 'info', 'size' => 'small']
+                        ];
+                    },
+                ],
+                'DEC_ROLE_NAME' => [
+                    'header' => 'Stockist Level', // 报单中心级别
+                    'headerOther' => ['width' => '110'],
+                    'value' => function($row) use($decRoleConfig) {
+                        return $decRoleConfig[$row['DEC_ROLE_ID']]['ROLE_NAME'] ?? '';
+                    },
+                ],
+                'OPEN_BANK_NAME' => [
+                    'header' => 'Bank Name', // 开户银行
+                    'headerOther' => ['width' => '110'],
+                    'value' => function($row) use($openBankConfig) {
+                        return $openBankConfig[$row['OPEN_BANK']]['BANK_NAME'] ?? '';
+                    },
+                ],
+                'BANK_NO' => [
+                    'header' => 'Bank Account Number', // 银行帐号
+                    'headerOther' => ['width' => '220'],
+                    'value' => function($row) {
+                        return "\t".$row['BANK_NO'];
+                    },
+                ],
+                'AREA' => [
+                    'header' => 'Common Address', // 常用地址
+                    'value' => function($row) use($regionConfig) {
+                        $province = $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
+                        $city = $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
+                        $county = $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
+                        return $province.$city.$county;
+                    },
+                    'showValue' => function($row) {
+                        $province = $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
+                        $city = $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
+                        $county = $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
+                        return '<div class="addr" title='.$province.$city.$county.'>'.$province.$city.$county.'</div>';
+                    },
+                    'headerOther' => [
+                        'width' => '200'
+                    ],
+                ],
+                'ALLOW_TRANSFER' => [
+                    'header' => 'Enable "Transfer"', // 转账功能开启
+                    'value' => function($row) {
+                        return $row['ALLOW_TRANSFER'] == 1 ? 'On': 'Off'; // '开启' : '关闭'
+                    },
+                    'headerOther' => function($row) {
+                        return [
+                            'width' => '130',
+                        ];
+                    },
+                    'valueOther' => function($row) {
+                        return [
+                            'tag'=>['type'=>(isset($row['ALLOW_TRANSFER']) && $row['ALLOW_TRANSFER']) ? 'Success' : 'Info', 'size' => 'small']
+                        ];
+                    },
+                ],
+            ];
+        }
+        return $this->columns;
+    }
+
+    /**
+     * 前台用于筛选的类型集合
+     * @return mixed
+     */
+    public function getFilterTypes()
+    {
+        if(!$this->filterTypes){
+            $this->filterTypes = [
+                'USER_NAME'=> ['name'=> 'Member code'], // 会员编号
+                'REAL_NAME'=> ['name'=> 'Member name'], // 会员姓名
+//                'ALLOW_LOGIN'=> ['name'=> '允许登录', 'other'=> 'yesOrNo'],
+                'CREATED_AT'=> ['name'=> 'Joining Date', 'other'=> 'date'], // 加入日期
+                'PERIOD_AT'=> ['name'=> 'Joining Period'], // 加入期数
+                'DEC_LV_NAME'=> ['name'=> 'Real time membership level', 'other'=> 'decLevel'], // 实时会员级别
+//                'DEC_LV_UPDATED_AT'=> ['name'=> '实时调整日期', 'other'=> 'date'],
+//                'LAST_DEC_LV_NAME'=> ['name'=> '结算时会员级别', 'other'=> 'decLevel'],
+                'EMP_LV_NAME'=> ['name'=> 'Real time employment', 'other'=> 'empLevel'], // 实时聘级
+                'CROWN_LV_NAME'=> ['name'=> 'Real time Crown', 'other'=> 'crownLevel'], // 实时聘级
+//                'HIGHEST_EMP_LV_NAME'=> ['name'=> '历史最高聘级', 'other'=> 'empLevel'],
+//                'HIGHEST_EMP_LV_PERIOD'=> ['name'=> '首次达到历史最高聘级的期数'],
+                'REC_USER_NAME'=> ['name'=> 'Recommendation No'],//推荐编号
+                'CON_USER_NAME'=> ['name'=> 'Placement No'],//安置编号
+                //'ID_TYPE'=> ['name'=> '证件类型', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '身份证']]],
+                'ID_CARD'=> ['name'=> 'Identification Number'],//证件号码
+//                'SPOUSE_NAME'=> ['name'=> '配偶姓名'],
+//                'SPOUSE_IDCARD'=> ['name'=> '配偶身份证号'],
+//                'SYSTEM_NAME'=> ['name'=> '体系名称', 'other'=> 'systems'],
+//                'SUB_COM_NAME'=> ['name'=> '所属分公司', 'other'=> 'subCompany'],
+                'MOBILE'=> ['name'=> 'Phone Number'],//手机号码
+//                'TEL'=> ['name'=> '备用手机号码'],
+                'DEC_USER_NAME'=> ['name'=> 'Stockist Code'], // 所属报单中心编号
+                'IS_DEC'=> ['name'=> 'Declaration center or not', 'other'=> 'yesOrNo'],//是否报单中心
+                'IS_STUDIO'=> ['name'=> 'Studio or not', 'other'=> 'yesOrNo'],//是否工作室
+                'DEC_ROLE_NAME'=> ['name'=> 'Stockist Level', 'other'=> 'decRole'],//报单中心级别
+//                'OPEN_BANK_NAME'=> ['name'=> '开户银行', 'other'=> 'banks'],
+//                'BANK_AREA'=> ['name'=> '银行地区', 'other'=> 'area'],
+//                'BANK_ADDRESS'=> ['name'=> '开户地址'],
+//                'BANK_NO'=> ['name'=> '银行账号'],
+//                'SEX'=> ['name'=> '性别', 'other'=> 'sex'],
+//                'NATION_NAME'=> ['name'=> '民族', 'other'=> 'nations'],
+                'AREA'=> ['name'=> 'Common address', 'other'=> 'area'],//常用地址
+                'STATUS'=> ['name'=> 'Active status', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> 'locking'],['id'=> 1, 'name'=> 'activation']]],
+//                'STATUS'=> ['name'=> '激活状态', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '锁定'],['id'=> 1, 'name'=> '激活']]],
+//                'ADDRESS'=> ['name'=> '身份证地址'],
+//                'IS_AUTO_WITHDRAW'=> [
+//                    'isUserTable'=> false,
+//                    'name'=> '提现方式',
+//                    'other'=> 'select',
+//                    'selectData'=> [['id'=> 0, 'name'=> '手动'], ['id'=> 1, 'name'=> '自动']]
+//                ],
+//                'VERIFIED'=> ['name'=> '实名认证', 'other'=> 'yesOrNo'],
+//                'VERIFIED_AT'=> ['name'=> '实名认证日期', 'other'=> 'date'],
+//                'IS_DIRECT_SELLER'=> ['name'=> '是否直销员', 'other'=> 'yesOrNo'],
+//                'IS_SYSTEM_LEADER'=> ['name'=> '是否体系领导人', 'other'=> 'yesOrNo'],
+//                'IS_GROUP_LEADER'=> ['name'=> '是否团队领导人', 'other'=> 'yesOrNo'],
+//                'ALLOW_TRANSFER'=> ['name'=> '转账功能开启', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '关闭'],['id'=> 1, 'name'=> '开启']]],
+//                'DEC_CLOSED'=> ['name'=> '是否关闭报单', 'other'=> 'yesOrNo'],
+            ];
+        }
+        return $this->filterTypes;
+    }
+}

+ 25 - 0
console/controllers/ShopController.php

@@ -10,6 +10,7 @@ namespace console\controllers;
 use backendApi\modules\v1\models\lists\shop\DecOrderList;
 use backendApi\modules\v1\models\lists\shop\GoodsList;
 use backendApi\modules\v1\models\lists\shop\OrderList;
+use backendApi\modules\v1\models\lists\shop\BaOrderList;
 use common\libs\export\module\ShopExport;
 use Yii;
 
@@ -130,4 +131,28 @@ class ShopController extends BaseController
         unset($factory);
         return false;
     }
+
+    /**
+     * BA订单列表导出
+     * @param $taskId
+     * @return bool
+     */
+    public function actionBaOrderListExport($taskId){
+        $factory = ShopExport::factory($taskId);
+        $factory->listModelClass = BaOrderList::class;
+        try {
+            if ($factory->generateOrderExcel()) {
+                Yii::$app->swooleAsyncTimer->pushAsyncResultToAdmin($factory->getUserId(), 'BA订单列表导出成功');
+            }
+            unset($factory);
+            return true;
+        } catch (\Exception $e) {
+            echo '订单列表导出失败。详情:' . $e->getMessage();
+            Yii::$app->swooleAsyncTimer->pushAsyncResultToAdmin($factory->getUserId(), 'BA订单列表导出失败。详情:' . $e->getMessage(), false);
+        }
+
+        unset($factory);
+        return false;
+    }
+
 }

+ 10 - 0
console/controllers/UserController.php

@@ -11,6 +11,7 @@ use backendApi\modules\v1\models\lists\bonus\PerfOrderList;
 use backendApi\modules\v1\models\lists\user\BindList;
 use backendApi\modules\v1\models\lists\user\GroupList;
 use backendApi\modules\v1\models\lists\user\IndexList;
+use backendApi\modules\v1\models\lists\user\BaUserList;
 use backendApi\modules\v1\models\lists\user\MoveList;
 use backendApi\modules\v1\models\lists\user\StatusAuditList;
 use backendApi\modules\v1\models\lists\user\SystemList;
@@ -181,4 +182,13 @@ class UserController extends BaseController
         unset($factory, $taskId, $className, $listName);
         return false;
     }
+
+    /**
+     * BA会员列表导出
+     * @param $taskId
+     * @return bool
+     */
+    public function actionBaUserListExport($taskId){
+        return $this->_export($taskId, BaUserList::class, 'Ba_Member_list');
+    }
 }

+ 4 - 1
frontendEle/package.json

@@ -16,18 +16,21 @@
   },
   "dependencies": {
     "ajv": "^6.2.0",
+    "animate": "^1.0.0",
     "axios": "^0.19.0",
     "babel-polyfill": "^6.26.0",
     "countup.js": "^1.9.3",
     "echarts": "^4.1.0",
     "element-ui": "^2.13.0",
+    "font-awesome": "^4.7.0",
     "nix-tinymce": "^1.0.7",
     "v-charts": "^1.16.20",
     "vue": "^2.6.14",
     "vue-countup-v2": "^1.0.3",
     "vue-paystack": "^2.0.4",
     "vue-router": "^3.0.2",
-    "vuex": "^3.0.1"
+    "vuex": "^3.0.1",
+    "waves": "^0.1.1"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",