提交修改会员编码

backendEle/src/utils/config_development_example.js

@@ -1,5 +1,5 @@
 const APP_NAME = '奖金结算系统'
-const SERVER_API_DOMAIN = 'backapi.anran.leo'
+const SERVER_API_DOMAIN = '16.163.228.151:8012'
 const SERVER_API_HTTP_TYPE = 'http://'
 const SERVER_API_PORT = ''  // ':8102'
 const SERVER_API_VERSION = 'v1'
@@ -8,11 +8,11 @@ const WEBSOCKET_HOST = 'ws://127.0.0.1:9512'
 const BONUS_WEBSOCKET_HOST = 'ws://127.0.0.1:9512'
 const DEVICE_TYPE = 'pc'
 const ACCESS_TOKEN_PREFIX = 'Bearer '
-const CDN_BASE_URL = 'http://abc.anran.io'
+const CDN_BASE_URL = 'http://16.163.228.151:8016'
 const CDN_IMG_URL = `${CDN_BASE_URL}/cdn/`
 const PRICE_IS_ROUND = true
-const FRONTEND_SERVER = 'http://192.168.31.178:8103'
-const REGION_URL = 'http://tool.anran.io/cdn/jsdata/ar_region_data.js?ver=0.1'
+const FRONTEND_SERVER = 'http://16.163.228.151:8012'
+const REGION_URL = `${CDN_BASE_URL}/cdn/jsdata/ar_region_data.js?ver=0.1`
 
 export {
   APP_NAME,

backendEle/src/utils/config_production_example.js

@@ -1,18 +1,18 @@
 const APP_NAME = '奖金结算系统'
-const SERVER_API_DOMAIN = 'back.bonus.ar.wqcms.com'
+const SERVER_API_DOMAIN = '16.163.228.151:8012'
 const SERVER_API_HTTP_TYPE = 'http://'
 const SERVER_API_PORT = ''  // ':8102'
 const SERVER_API_VERSION = 'v1'
 const REQUEST_URL = `${SERVER_API_HTTP_TYPE}${SERVER_API_DOMAIN}${SERVER_API_PORT}/${SERVER_API_VERSION}/`
-const WEBSOCKET_HOST = 'ws://39.104.27.110:9513'
-const BONUS_WEBSOCKET_HOST = 'ws://39.104.27.110:9513'
+const WEBSOCKET_HOST = 'ws://127.0.0.1:9513'
+const BONUS_WEBSOCKET_HOST = 'ws://127.0.0.1:9513'
 const DEVICE_TYPE = 'pc'
 const ACCESS_TOKEN_PREFIX = 'Bearer '
-const CDN_BASE_URL = 'http://upload.ar.wqcms.com'
+const CDN_BASE_URL = 'http://16.163.228.151:8016'
 const CDN_IMG_URL = `${CDN_BASE_URL}/cdn/`
 const PRICE_IS_ROUND = true
-const FRONTEND_SERVER = 'http://bonusfront.ar.wqcms.com'
-const REGION_URL = 'http://upload.ar.wqcms.com/cdn/jsdata/ar_region_data.js?ver=0.1'
+const FRONTEND_SERVER = 'http://16.163.228.151:8012'
+const REGION_URL = 'http://16.163.228.151:8016/cdn/jsdata/ar_region_data.js?ver=0.1'
 
 export {
   APP_NAME,

common/helpers/user/Info.php

@@ -401,6 +401,23 @@ class Info {
         return $result;
     }
 
+    /**
+     * 新增加的 生成前端姓名里用户名
+     * @param string $prefix
+     * @param int $length
+     * @return string
+     */
+    public static function generateWebUserName(string $prefix = 'HZ', int $length = 10) {
+        $result = Tool::randomString($length, $prefix).array_rand([0,1,2,3,5,6,7,8,9],1);
+        if (substr($result ,-1) == '4'){
+            return self::generateWebUserName($prefix, $length);
+        }
+        if (User::find()->where('USER_NAME=:USER_NAME', [':USER_NAME' => $result])->exists()) {
+            return self::generateWebUserName($prefix, $length);
+        }
+        return $result;
+    }
+
     /**
      * 定位会员的子公司
      * @param $userArea

frontendApi/modules/v1/controllers/UserController.php

@@ -203,11 +203,26 @@ class UserController extends BaseController {
      * 报单管理
      */
     public function actionDec() {
+        // 生成随机码 , 初始化redis
+        $userName = Info::generateWebUserName('CQ',9);
+        $redis = \Yii::$app->redis;
+
         if (\Yii::$app->request->isPost) {
             $formModel = new DeclarationLoopForm();
             $formModel->scenario = 'userDec';
             $post = \Yii::$app->request->post();
-            $post['insertUserName'] = strtoupper($post['insertUserName']);
+
+            // 针对于会员编号的判断
+            $insertUserName = strtoupper($post['insertUserName']);
+            $getRedisUserName = $redis->get('key_'.$insertUserName);
+            if (!$getRedisUserName){
+                return static::notice('会员编号过期',400);
+            }
+            if ($insertUserName != $getRedisUserName){
+                return static::notice('和会员编号不符合',400);
+            }
+
+            $post['insertUserName'] = $insertUserName;
             $post['type'] = DeclarationForm::TYPE_ZC;
             $allData['data'][] = $post;
             if ($formModel->load($allData, '') && $formModel->add()) {
@@ -216,6 +231,7 @@ class UserController extends BaseController {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
             }
         }
+
         //所有报单套餐
         $allDecPackage = DeclarationPackage::getAllData();
         $decLevels = Cache::getDecLevelConfig();
@@ -241,9 +257,12 @@ class UserController extends BaseController {
         //$allGoods = ShopGoods::findAllAsArray('STATUS=1');
         // 所有开户行
         $allOpenBank = OpenBank::find()->where('STATUS=1')->orderBy('LIST_ORDER ASC')->asArray()->all();
-        if (!$userName = Info::generateUserName('LA',9)) {
+        if (!$userName) {
             return static::notice('会员编号生成失败', 400);
         }
+        //随机码保存在redis中方便进行比对
+        $msg = $redis->setex('key_'.$userName , 1800 , $userName);
+
         return static::notice(['allDecPackage' => $allDecPackage,'allGoods' => $allGoods,'allOpenBank' => $allOpenBank, 'userName' => $userName]);
     }
 

frontendEle/src/utils/config_development_example.js

@@ -1,5 +1,5 @@
 const APP_NAME = '奖金结算系统'
-const SERVER_API_DOMAIN = 'api.anran.leo'
+const SERVER_API_DOMAIN = '16.163.228.151:8013'
 const SERVER_API_HTTP_TYPE = 'http://'
 const SERVER_API_PORT = ''  // ':8102'
 const SERVER_API_VERSION = 'v1'
@@ -7,10 +7,10 @@ const REQUEST_URL = `${SERVER_API_HTTP_TYPE}${SERVER_API_DOMAIN}${SERVER_API_POR
 const WEBSOCKET_HOST = 'ws://127.0.0.1:9512'
 const DEVICE_TYPE = 'pc'
 const ACCESS_TOKEN_PREFIX = 'Bearer '
-const CDN_BASE_URL = 'http://abc.anran.io'
+const CDN_BASE_URL = 'http://16.163.228.151:8016'
 const CDN_IMG_URL = `${CDN_BASE_URL}/cdn/`
 const PRICE_IS_ROUND = true
-const REGION_URL = `${CDN_BASE_URL}/cdn/jsdata/ar_region_data.js?ver=0.1`
+const REGION_URL = 'http://16.163.228.151:8016/cdn/jsdata/ar_region_data.js?ver=0.1'
 
 export {
   APP_NAME,

frontendEle/src/utils/config_production_example.js

@@ -1,13 +1,13 @@
 const APP_NAME = '奖金结算系统'
-const SERVER_API_DOMAIN = 'api.bonus.ar.wqcms.com'
+const SERVER_API_DOMAIN = '16.163.228.151:8013'
 const SERVER_API_HTTP_TYPE = 'http://'
 const SERVER_API_PORT = ''  // ':8102'
 const SERVER_API_VERSION = 'v1'
 const REQUEST_URL = `${SERVER_API_HTTP_TYPE}${SERVER_API_DOMAIN}${SERVER_API_PORT}/${SERVER_API_VERSION}/`
-const WEBSOCKET_HOST = 'ws://39.104.27.110:9513'
+const WEBSOCKET_HOST = 'ws://127.0.0.1:9513'
 const DEVICE_TYPE = 'pc'
 const ACCESS_TOKEN_PREFIX = 'Bearer '
-const CDN_BASE_URL = 'http://upload.ar.wqcms.com'
+const CDN_BASE_URL = 'http://16.163.228.151:8016'
 const CDN_IMG_URL = `${CDN_BASE_URL}/cdn/`
 const PRICE_IS_ROUND = true
 const REGION_URL = `${CDN_BASE_URL}/cdn/jsdata/ar_region_data.js?ver=0.1`