更改校验

common/messages/en-US/app.php

@@ -216,6 +216,7 @@ return [
     'changeUserStatusError' => 'change user status error',
     'dataFormatError' => 'Data format error',
     'decUserNameDoesNotExist' => '请输入报单中心编号',
+    'decUserNameIsWrong' => '报单中心编号输入错误',
 
 
 

common/messages/zh-CN/app.php

@@ -220,6 +220,7 @@ return [
     'brandAmbassadorUpgradeError' => 'BA会员升级错误',
     'changeUserStatusError' => '修改会员状态错误',
     'decUserNameDoesNotExist' => '请输入报单中心编号',
+    'decUserNameIsWrong' => '报单中心编号输入错误',
 
 
     # 奖金

common/models/forms/ApproachDeclarationForm.php

@@ -127,10 +127,10 @@ class ApproachDeclarationForm extends Model
     {
         return [
             [['type','decLv','decWay','packageId', 'insertUserName', 'realName',/* 'insertUserIdCard',*/ 'mobile', 'address', 'openBank', 'bankAddress', 'bankNo','bankProvince','bankCity','bankCounty','consignee','acceptMobile','province','city','county','cityName','lgaName','decUserName', 'conUserName', 'recUserName', 'location'], 'trim'],
-            [['type','decLv','decWay','insertUserName',/* 'insertUserIdCard',*/'password','payPassword','decUserName'], 'required'],
+            [['type','decLv','decWay','insertUserName',/* 'insertUserIdCard',*/'password','payPassword'], 'required'],
             [['type'], 'isType', 'on'=>['userDec', 'canDec']],
             [['insertUserName'], 'isCanAddUser'],
-            [['decUserName', 'decType'], 'issetDec'],
+//            [['decUserName', 'decType'], 'issetDec'],
             [['conUserName'], 'isConUserName'],
             [['recUserName'], 'isRecUserName'],
             [['location'], 'isLocation'],

common/models/forms/ApproachDeclarationLoopForm.php

@@ -177,7 +177,6 @@ class ApproachDeclarationLoopForm extends Model
                     }
 
                 }
-				
                 if (is_array($value)) {
                     foreach($value as $key=>$decFormData){
                         $model->$key = $decFormData;
@@ -201,9 +200,7 @@ class ApproachDeclarationLoopForm extends Model
                     throw new Exception(Yii::t('app', 'reportFormatIncorrect'));
                 }
             }
-
             $transaction->commit();
-
             return $result;
         } catch (\Exception $e){
             $transaction->rollBack();

common/models/forms/DeclarationForm.php

@@ -123,10 +123,10 @@ class DeclarationForm extends Model
     {
         return [
             [['type','decLv','decWay','packageId', 'insertUserName', 'realName',/* 'insertUserIdCard',*/ 'mobile', 'address', 'openBank', 'bankAddress', 'bankNo','bankProvince','bankCity','bankCounty','consignee','acceptMobile','province','city','county','cityName','lgaName','decUserName', 'conUserName', 'recUserName', 'location'], 'trim'],
-            [['type','decLv','decWay','insertUserName',/* 'insertUserIdCard',*/'password','payPassword','decUserName'], 'required'],
+            [['type','decLv','decWay','insertUserName',/* 'insertUserIdCard',*/'password','payPassword'], 'required'],
             [['type'], 'isType', 'on'=>['userDec', 'canDec']],
             [['insertUserName'], 'isCanAddUser'],
-            [['decUserName'], 'issetDec'],
+//            [['decUserName'], 'issetDec'],
             [['conUserName'], 'isConUserName'],
             [['recUserName'], 'isRecUserName'],
             [['location'], 'isLocation'],

frontendApi/modules/v1/controllers/ShopController.php

@@ -162,12 +162,16 @@ class ShopController extends BaseController {
             if($userInfo['IS_DEC'] == 1 && !empty($post['userName']) && $post['userName'] != $userInfo['USER_NAME']){
                 return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
             }
-            if($post['userName']){
+            if($post['userName'] && $userInfo['IS_DEC'] == 0){
                 //查询报单编号是否存在
                 $userId = Info::getUserIdByUserName($post['userName']);
                 if(!$userId){
                     return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
                 }
+                $isDec = User::getEnCodeInfo($userId)['IS_DEC'];
+                if(!$isDec){
+                    return static::notice(Yii::t('app', 'decUserNameIsWrong'), 400);
+                }
             }
 
             $formModel->decUserName = $post['userName'];
@@ -207,11 +211,15 @@ class ShopController extends BaseController {
                 return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
             }
             //查询报单编号是否存在
-            if($post['userName']){
+            if($post['userName'] && $userInfo['IS_DEC'] == 0){
                 $userId = Info::getUserIdByUserName($post['userName']);
                 if(!$userId){
                     return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
                 }
+                $isDec = User::getEnCodeInfo($userId)['IS_DEC'];
+                if(!$isDec){
+                    return static::notice(Yii::t('app', 'decUserNameIsWrong'), 400);
+                }
             }
             $formModel->decUserName = $post['userName'];
             if ($formModel->load($post, '') && $order = $formModel->add()) {

frontendApi/modules/v1/controllers/UserController.php

@@ -388,13 +388,17 @@ class UserController extends BaseController {
         if (\Yii::$app->request->isPost) {
             $userInfo = User::getEnCodeInfo(\Yii::$app->user->id);
             if($userInfo['IS_DEC'] == 1 && !empty($post['decUserName']) && $post['decUserName'] != $userInfo['USER_NAME']){
-                return static::notice(Yii::t('app', 'decUserNameDoesNotExist'), 400);
+                return static::notice(Yii::t('app', 'decUserNameIsWrong'), 400);
             }
-            if($post['decUserName']){
+            if($userInfo['IS_DEC'] == 0 && $post['decUserName']){
                 //查询报单编号是否存在
                 $userId = Info::getUserIdByUserName($post['decUserName']);
                 if(!$userId){
-                    return static::notice(Yii::t('app', 'stockistDoesNotExist'), 400);
+                    return static::notice(Yii::t('app', 'decUserNameIsWrong'), 400);
+                }
+                $isDec = User::getEnCodeInfo($userId)['IS_DEC'];
+                if(!$isDec){
+                    return static::notice(Yii::t('app', 'decUserNameIsWrong'), 400);
                 }
             }
             // 根据支付方式区分逻辑