kevin_zhangl 3 лет назад
Родитель
Сommit
8c5f80736e
33 измененных файлов с 116 добавлено и 113 удалено
  1. 3 3
      backendApi/modules/v1/controllers/AtlasController.php
  2. 7 7
      backendApi/modules/v1/controllers/BonusController.php
  3. 3 3
      backendApi/modules/v1/controllers/ConfigController.php
  4. 21 20
      backendApi/modules/v1/controllers/FinanceController.php
  5. 1 1
      backendApi/modules/v1/controllers/ReconsumeController.php
  6. 2 2
      backendApi/modules/v1/controllers/ShopController.php
  7. 5 5
      backendApi/modules/v1/controllers/UserController.php
  8. 1 1
      backendApi/modules/v1/models/LoginForm.php
  9. 2 2
      backendEle/src/views/user/move-add.vue
  10. 8 8
      common/models/forms/ChangeBalanceForm.php
  11. 24 22
      common/models/forms/ChangePerfForm.php
  12. 1 1
      common/models/forms/ChangeShowEmpLvForm.php
  13. 1 1
      common/models/forms/CloseDecForm.php
  14. 1 1
      common/models/forms/CloseLoginForm.php
  15. 1 1
      common/models/forms/DealTypeForm.php
  16. 1 1
      common/models/forms/DecLevelLogForm.php
  17. 1 1
      common/models/forms/DecPackageForm.php
  18. 1 1
      common/models/forms/DecRoleLogForm.php
  19. 2 2
      common/models/forms/InvoiceAuditForm.php
  20. 2 2
      common/models/forms/InvoiceBalanceAuditForm.php
  21. 1 1
      common/models/forms/RechargeForm.php
  22. 2 2
      common/models/forms/ReconsumeForm.php
  23. 2 2
      common/models/forms/RegInfoAuditForm.php
  24. 1 1
      common/models/forms/RegTypeForm.php
  25. 2 2
      common/models/forms/ResendQYForm.php
  26. 1 1
      common/models/forms/SendCFAndLXForm.php
  27. 2 2
      common/models/forms/ShopGoodsForm.php
  28. 1 1
      common/models/forms/UserBindForm.php
  29. 2 2
      common/models/forms/UserTeamworkForm.php
  30. 2 2
      common/models/forms/WithdrawForm.php
  31. 5 5
      frontendApi/modules/v1/controllers/BonusController.php
  32. 6 6
      frontendApi/modules/v1/controllers/FinanceController.php
  33. 1 1
      frontendApi/modules/v1/controllers/OauthController.php

+ 3 - 3
backendApi/modules/v1/controllers/AtlasController.php

@@ -72,7 +72,7 @@ class AtlasController extends BaseController {
         if ($userName !== '') {
             //$oneUser = Info::getUserByUserNameFromUserInfoTable($userName);
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400); // 会员不存在
             }
         } else {
             $userId = Yii::$app->params['mainUserId'];
@@ -141,7 +141,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400); // 会员不存在
             }
         }
         $form = new AtlasExportForm();
@@ -206,7 +206,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400); // 会员不存在
             }
         }
         $form = new AtlasExportForm();

+ 7 - 7
backendApi/modules/v1/controllers/BonusController.php

@@ -693,7 +693,7 @@ class BonusController extends BaseController {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
     }
 
     /**
@@ -1076,7 +1076,7 @@ class BonusController extends BaseController {
         $periodNum = Yii::$app->request->get('periodNum');
         if (!$periodNum) return static::notice('请填写期数', 400);
         if (!$userName = Yii::$app->request->get('userName')) return static::notice('请填写会员编号', 400);
-        if(!$userId = Info::getUserIdByUserName($userName))  return static::notice('会员不存在', 400);
+        if(!$userId = Info::getUserIdByUserName($userName))  return static::notice('Member does not exist', 400); // 会员不存在
         //会员是否有业绩单
         if(!PerfOrder::find()->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',[':USER_ID'=>$userId,':PERIOD_NUM'=>$periodNum])->exists()){
             return static::notice('该会员本期没有业绩单', 400);
@@ -1096,7 +1096,7 @@ class BonusController extends BaseController {
         $periodNum = Yii::$app->request->get('periodNum');
         if (!$periodNum) return static::notice('请填写期数', 400);
         if (!$userName = Yii::$app->request->get('userName')) return static::notice('请填写会员编号', 400);
-        if(!$userId = Info::getUserIdByUserName($userName))  return static::notice('会员不存在', 400);
+        if(!$userId = Info::getUserIdByUserName($userName))  return static::notice('Member does not exist', 400); // 会员不存在
         //会员是否有业绩单
         if(!PerfOrder::find()->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',[':USER_ID'=>$userId,':PERIOD_NUM'=>$periodNum])->exists()){
             return static::notice('该会员本期没有业绩单', 400);
@@ -1924,7 +1924,7 @@ class BonusController extends BaseController {
         $period = Period::instance();
         $yearMonth = $period->getYearMonth($periodNum);
         if (!$userId = Info::getUserIdByUserName($userName)) {
-            return static::notice('会员不存在', 400);
+            return static::notice('Member does not exist', 400); // 会员不存在
         }
         $data = CalcBonus::findUseSlaves()->yearMonth($yearMonth)->where('PERIOD_NUM=:PERIOD_NUM AND USER_ID=:USER_ID', [':PERIOD_NUM' => $periodNum, ':USER_ID' => $userId])->asArray()->one();
         if ($data) {
@@ -2049,7 +2049,7 @@ class BonusController extends BaseController {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
     }
 
     /**
@@ -2651,7 +2651,7 @@ class BonusController extends BaseController {
     public function actionRealTimePerf() {
         $userName = Yii::$app->request->get('userName');
         if (!$userId = Info::getUserIdByUserName($userName)) {
-            return static::notice('会员不存在', 400);
+            return static::notice('Member does not exist', 400); // 会员不存在
         }
         $period = Period::instance();
         $newPerf = Perf::getPeriodNewPerf($userId);
@@ -2680,7 +2680,7 @@ class BonusController extends BaseController {
     public function actionYcPerf() {
         $userName = Yii::$app->request->get('userName');
         if (!$userId = Info::getUserIdByUserName($userName)) {
-            return static::notice('会员不存在', 400);
+            return static::notice('Member does not exist', 400); // 会员不存在
         }
 
         $userPerfData = Perf::getUserPerf($userId);

+ 3 - 3
backendApi/modules/v1/controllers/ConfigController.php

@@ -530,7 +530,7 @@ class ConfigController extends BaseController {
                 return static::notice('操作失败,请重试');
             }
         }
-        return static::notice('非法请求');
+        return static::notice('Illegal request'); // 非法请求
     }
 
     /**
@@ -775,7 +775,7 @@ class ConfigController extends BaseController {
         $id = Yii::$app->request->get('id');
         $regType = RegType::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$regType) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         return static::notice(['id' => $regType['ID'], 'typeName' => $regType['TYPE_NAME'], 'isPact' => $regType['IS_PACT'], 'monthAmount' => $regType['MONTH_LIMIT_AMOUNT'], 'yearAmount' => $regType['YEAR_LIMIT_AMOUNT'], 'remark' => $regType['REMARK']]);
     }
@@ -799,7 +799,7 @@ class ConfigController extends BaseController {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
     }
 
     /**

+ 21 - 20
backendApi/modules/v1/controllers/FinanceController.php

@@ -138,8 +138,8 @@ class FinanceController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionChangeBalance() {
-        if (Yii::$app->request->isPost) {
-            return static::edit(ChangeBalanceForm::class, '申请变动会员余额成功', 'changeAdd', ['changeAdd'], null, function ($formModel, $result) {
+        if (Yii::$app->request->isPost) { // 申请变动会员余额成功
+            return static::edit(ChangeBalanceForm::class, 'Application for change of member balance succeeded', 'changeAdd', ['changeAdd'], null, function ($formModel, $result) {
                 // $userInfo = User::getBaseInfoFromRedis($result['USER_ID']);
                 // $type = BalanceAudit::TYPE[$result['TYPE']]['label'];
                 // Log::adminHandle('申请调整会员' . $userInfo['USER_NAME'] . '的' . $type . '余额,金额:' . $result['AMOUNT'], 1, $userInfo['ID'], $userInfo['USER_NAME'], $result['CREATE_REMARK']);
@@ -168,7 +168,7 @@ class FinanceController extends BaseController {
         $id = Yii::$app->request->get('id');
         $balanceAudit = BalanceAudit::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$balanceAudit) {
-            return static::notice('数据不存在', 400);
+            return static::notice('Data not exists', 400);
         }
         $balanceAudit['BASE_INFO'] = Info::baseInfoWithBalance($balanceAudit['USER_ID']);
         return static::notice(['id' => $balanceAudit['ID'], 'baseInfo' => $balanceAudit['BASE_INFO'], 'type' => $balanceAudit['TYPE'], 'dealType' => $balanceAudit['DEAL_TYPE'], 'amount' => Tool::formatPrice($balanceAudit['AMOUNT']), 'remark' => $balanceAudit['CREATE_REMARK'], 'isShow' => $balanceAudit['REMARK_IS_SHOW']]);
@@ -186,7 +186,7 @@ class FinanceController extends BaseController {
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
             // $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('修改' . $user['USER_NAME'] . '调整会员余额录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('修改调整会员余额录入数据完成');
+            return static::notice('Modification and adjustment of member balance entry data completed'); // 修改调整会员余额录入数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -203,7 +203,7 @@ class FinanceController extends BaseController {
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->pass()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('审核通过' . $user['USER_NAME'] . '调整会员余额录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('审核通过会员余额完成');
+            return static::notice('The review is done through the member balance'); // 审核通过会员余额完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -222,7 +222,7 @@ class FinanceController extends BaseController {
                 $userName = Info::getUserNameByUserId($value['userId']);
                 // Log::adminHandle('审核调整会员余额录入数据' . $userName . '发放' . $value['type'], 1, $value['userId'], $userName);
             }*/
-            return static::notice('批量审核/审核拒绝会员余额完成');
+            return static::notice('Batch audit/audit reject member balance completed'); // 批量审核/审核拒绝会员余额完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -362,8 +362,8 @@ class FinanceController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionWithdrawAdd() {
-        if (Yii::$app->request->isPost) {
-            return parent::edit(WithdrawForm::class, '新增会员提现成功', 'addByAdmin', ['add'], null, function ($form, $result) {
+        if (Yii::$app->request->isPost) {// 新增会员提现成功
+            return parent::edit(WithdrawForm::class, 'The newly added member successfully withdrew cash', 'addByAdmin', ['add'], null, function ($form, $result) {
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '提现' . $result['WITHDRAW_AMOUNT'], 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -383,7 +383,7 @@ class FinanceController extends BaseController {
         $id = Yii::$app->request->get('id');
         $withdraw = Withdraw::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$withdraw) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         $withdraw['BASE_INFO'] = Info::baseInfoZh($withdraw['USER_ID']);
         $withdraw['PLAN_PAID_AT'] = $withdraw['PLAN_PAID_AT'] ? Date::convert($withdraw['PLAN_PAID_AT']) : null;
@@ -405,12 +405,12 @@ class FinanceController extends BaseController {
             if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->editByAdmin()) {
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('修改提现信息,ID为:' . $result['ID'], 1, $result['USER_ID'], $user['USER_NAME']);
-                return static::notice('修改提现信息成功');
+                return static::notice('The withdrawal information is modified successfully.'); // 修改提现信息成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
     }
 
     /**
@@ -436,7 +436,7 @@ class FinanceController extends BaseController {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
     }
 
     /**
@@ -507,7 +507,7 @@ class FinanceController extends BaseController {
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误:' . $errorMsg, 400);
+                return static::notice('Error:' . $errorMsg, 400);
             }
         }
     }
@@ -537,7 +537,7 @@ class FinanceController extends BaseController {
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误2:' . $errorMsg, 400);
+                return static::notice('error:' . $errorMsg, 400);
             }
         }
     }
@@ -752,8 +752,8 @@ class FinanceController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionPerfApply() {
-        if (\Yii::$app->request->isPost) {
-            return static::edit(ChangePerfForm::class, '申请调整会员业绩成功', 'add', ['add'], null, function ($formModel, $result) {
+        if (\Yii::$app->request->isPost) { // 申请调整会员业绩成功
+            return static::edit(ChangePerfForm::class, 'The application to adjust the member performance was successful', 'add', ['add'], null, function ($formModel, $result) {
                 // 添加操作日志
                 // Log::adminHandle('申请调整会员' . $formModel->userName . '的' . $formModel->location . '区业绩,调整额度为:' . $formModel->amount);
             });
@@ -770,11 +770,12 @@ class FinanceController extends BaseController {
     public function actionPerfApplyGet() {
         $periodNum = Period::sentMaxPeriodNum();
         if (Period::find()->where('IS_SENT=:IS_SENT AND PERIOD_NUM>=:START_PERIOD_NUM AND PERIOD_NUM<=:END_PERIOD_NUM', [':IS_SENT' => Period::SEND_FINISH, ':START_PERIOD_NUM' => $periodNum + 1, ':END_PERIOD_NUM' => $periodNum + 1])->count() == 1) {
-            return static::notice('下一期【' . ($periodNum + 1) . '】已挂网,该期无法调整', 400);
+//            return static::notice('下一期【' . ($periodNum + 1) . '】已挂网,该期无法调整', 400);
+            return static::notice('The next period [' . ($periodNum + 1) . '] has been connected to the net, and this period cannot be adjusted', 400);
         }
         $userName = \Yii::$app->request->get('userName');
         if (!$userId = Info::getUserIdByUserName($userName)) {
-            return static::notice('会员不存在', 400);
+            return static::notice('Member does not exist', 400); // 会员不存在
         }
         $perf = PerfAudit::getUserPerfAndPerfPeriod($userId, $periodNum);
         return static::notice(array_merge(['REAL_NAME' => Info::getUserRealNameByUserId($userId)], $perf));
@@ -789,7 +790,7 @@ class FinanceController extends BaseController {
         $id = Yii::$app->request->get('id');
         $perfAudit = PerfAudit::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$perfAudit) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         $perf = PerfAudit::getUserPerfAndPerfPeriod($perfAudit['USER_ID'], $perfAudit['PERIOD_NUM']);
         return static::notice(['userInfo'=>array_merge(['USER_NAME' => Info::getUserNameByUserId($perfAudit['USER_ID']),'REAL_NAME' => Info::getUserRealNameByUserId($perfAudit['USER_ID'])], $perf),'perfAudit'=>['periodNum'=>$perfAudit['PERIOD_NUM'],'perfType'=>$perfAudit['PERF_TYPE'],'location'=>$perfAudit['PERF_LOCATION'],'amount'=>Tool::formatPrice($perfAudit['AMOUNT']),'remark'=>$perfAudit['REMARK'],'id'=>$perfAudit['ID']]]);
@@ -889,7 +890,7 @@ class FinanceController extends BaseController {
         $id = Yii::$app->request->get('id');
         $dealType = DealType::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$dealType) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         return static::notice(['id' => $dealType['ID'], 'typeName' => $dealType['TYPE_NAME'], 'isEnable' => $dealType['IS_ENABLE'] ? true : false, 'isPreset' => $dealType['IS_PRESET'] ? true : false, 'createRemark' => $dealType['CREATE_REMARK'], 'sort' => $dealType['SORT_ORDER']]);
     }

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

@@ -160,7 +160,7 @@ class ReconsumeController extends BaseController {
         $id = Yii::$app->request->get('id');
         $reconsumAudit = ReconsumeAudit::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$reconsumAudit) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         $reconsumAudit['BASE_INFO'] = Info::baseInfoZh($reconsumAudit['USER_ID']);
         $reConsumePool = Reconsume::getUserReconsumePool($reconsumAudit['USER_ID']);

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

@@ -662,7 +662,7 @@ class ShopController extends BaseController {
         if(\Yii::$app->request->isPost) {
             return parent::edit(OrderForm::class, '发货成功', 'adminDelivery', ['adminDelivery']);
         }
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
     }
 
     /**
@@ -733,6 +733,6 @@ class ShopController extends BaseController {
         if(\Yii::$app->request->isPost) {
             return parent::edit(OrderForm::class, '退款成功', 'adminRefund', ['adminRefund']);
         }
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
     }
 }

+ 5 - 5
backendApi/modules/v1/controllers/UserController.php

@@ -790,7 +790,7 @@ class UserController extends BaseController
         $id = Yii::$app->request->get('id');
         $userMove = UserMove::find()->where('ID=:ID', [':ID' => $id])->asArray()->one();
         if (!$userMove) {
-            return static::notice('数据不存在', 400);
+            return static::notice('Data not exists', 400);
         }
         $userMove['BASE_INFO'] = Info::baseInfoWithNet($userMove['USER_ID']);
         $toUserInfo = Info::baseInfoZh($userMove['TO_UID']);
@@ -810,7 +810,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
             $user = Info::baseInfoZh($result['USER_ID']);
             // Log::adminHandle('修改' . $user['USER_NAME'] . '移网录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('修改移网录入数据完成');
+            return static::notice('The modification of the data input is complete'); // 修改移网录入数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -828,7 +828,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->pass()) {
             $user = Info::baseInfoZh($result['USER_ID']);
             // Log::adminHandle('审核通过移网数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('正在移动中,请稍候');
+            return static::notice("It's on the move. Please wait"); // 正在移动中,请稍候
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -847,7 +847,7 @@ class UserController extends BaseController
         $formModel->scenario = 'changeAudit';
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->changeAudit()) {
             // Log::adminHandle('审核移网数据');
-            return static::notice('审核移网数据完成');
+            return static::notice('Check and verify the net moving data'); // 审核移网数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1952,7 +1952,7 @@ class UserController extends BaseController
         $id = Yii::$app->request->get('id');
         $userStatusAudit = UserStatusAudit::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$userStatusAudit) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         $userStatusAudit['BASE_INFO'] = Info::baseInfoZh($userStatusAudit['USER_ID']);
         $statuses = Yii::$app->params['userStatus'];

+ 1 - 1
backendApi/modules/v1/models/LoginForm.php

@@ -56,7 +56,7 @@ class LoginForm extends Model {
         if (!$this->hasErrors()) {
             $this->getUser();
             if(!$this->_user){
-                $this->addError($attribute, '会员不存在');
+                $this->addError($attribute, 'Member does not exist');
                 return false;
             }
             if (!$this->_user->validatePassword($this->password)) {

+ 2 - 2
backendEle/src/views/user/move-add.vue

@@ -139,11 +139,11 @@ export default {
         network.getData('user/chk-relation', {userName: this.form.moveUserName, toUserName: this.form.toConUserName}).then(response => {
           if (response.is === 1) {
             this.isRelation = true
-            this.toAlertTile = '在同一推荐网络内'
+            this.toAlertTile = 'Within the same sponsor network' // 在同一推荐网络内
             this.toAlertType = 'success'
           } else {
             this.isRelation = false
-            this.toAlertTile = '不同一推荐网络内'
+            this.toAlertTile = 'Not in the same sponsor network' // 不同一推荐网络内
             this.toAlertType = 'warning'
           }
           this.showToName = response.real_name

+ 8 - 8
common/models/forms/ChangeBalanceForm.php

@@ -109,7 +109,7 @@ class ChangeBalanceForm extends Model {
         $model = $this->_model = BalanceAudit::findOne(['ID' => $this->id]);
         $this->_userId = $model['USER_ID'];
         if ($model->AUDIT_STATUS > \Yii::$app->params['auditStatus']['un']['value']) {
-            $this->addError($attribute, '该申请已经被审核,不能重复审核');
+            $this->addError($attribute, 'The application has been reviewed and cannot be reviewed again');// 该申请已经被审核,不能重复审核
         }
     }
 
@@ -128,7 +128,7 @@ class ChangeBalanceForm extends Model {
                 }
             }
         } else {
-            $this->addError($attribute, '会员不存在');
+            $this->addError($attribute, 'Member does not exist'); // 会员不存在
         }
     }
 
@@ -185,20 +185,20 @@ class ChangeBalanceForm extends Model {
         }
         switch ($this->auditStatus) {
             case 'un':
-                $this->addError($attribute, '不能设置为待审核状态' . $this->auditStatus);
+                $this->addError($attribute, 'Cannot be set to pending review' . $this->auditStatus); // 不能设置为待审核状态
                 break;
             case 'true':
                 if (isset($oneData['AUDIT_STATUS']) && $oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['true']['value']) {
-                    $this->addError($attribute, '已经审核通过不能重复审核');
+                    $this->addError($attribute, 'The audit has been approved and cannot be repeated'); // 已经审核通过不能重复审核
                 } elseif (isset($oneData['AUDIT_STATUS']) && $oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['reject']['value']) {
-                    $this->addError($attribute, '已经审核拒绝不能重复审核');
+                    $this->addError($attribute, 'It has been reviewed and rejected and cannot be reviewed again'); // 已经审核拒绝不能重复审核
                 }
                 break;
             case 'reject':
                 if ($oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['true']['value']) {
-                    $this->addError($attribute, '已经审核通过不能重复审核');
+                    $this->addError($attribute, 'The audit has been approved and cannot be repeated'); // 已经审核通过不能重复审核
                 } elseif ($oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['reject']['value']) {
-                    $this->addError($attribute, '已经审核拒绝不能重复审核');
+                    $this->addError($attribute, 'It has been reviewed and rejected and cannot be reviewed again'); // 已经审核拒绝不能重复审核
                 }
                 break;
             default:
@@ -220,7 +220,7 @@ class ChangeBalanceForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selected) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
         if (!is_array($this->selected)) {
             $this->selected = [$this->selected];

+ 24 - 22
common/models/forms/ChangePerfForm.php

@@ -103,7 +103,7 @@ class ChangePerfForm extends Model {
         $model = $this->_model = PerfAudit::findOne(['ID' => $this->id]);
         $this->_userId = $model->USER_ID;
         if ($model->AUDIT_STATUS > \Yii::$app->params['auditStatus']['un']['value']) {
-            $this->addError($attribute, '该申请已经被审核,不能重复审核');
+            $this->addError($attribute, 'The application has been reviewed and cannot be reviewed again');// 该申请已经被审核,不能重复审核
         }
     }
 
@@ -116,10 +116,10 @@ class ChangePerfForm extends Model {
         if ($this->_userId) {
             // 如果该会员已经存在一个待审核的申请,直接提示错误
             if (PerfAudit::find()->where('USER_ID=:USER_ID AND AUDIT_STATUS=:AUDIT_STATUS', [':USER_ID' => $this->_userId, ':AUDIT_STATUS' => \Yii::$app->params['auditStatus']['un']['value']])->exists()) {
-                $this->addError($attribute, '该会员审核列表中如果有待审记录,需等待待审核记录审核后才可提交');
+                $this->addError($attribute, 'If there is a pending record in the member review list, it shall be submitted after the pending record has been reviewed'); // 该会员审核列表中如果有待审记录,需等待待审核记录审核后才可提交
             }
         } else {
-            $this->addError($attribute, '会员不存在');
+            $this->addError($attribute, 'Member does not exist'); // 会员不存在
         }
     }
 
@@ -130,10 +130,12 @@ class ChangePerfForm extends Model {
     public function isPeriodNum($attribute) {
         $period = Period::instance();
         if (!$period->isSent($this->periodNum)) {
-            $this->addError($attribute, '该期【' . $this->periodNum . '】未挂网,无法调整');
+//            $this->addError($attribute, '该期【' . $this->periodNum . '】未挂网,无法调整');
+            $this->addError($attribute, 'This period [' . $this->periodNum . '] is not connected to the net and cannot be adjusted');
         }
         if (Period::find()->where('IS_SENT=:IS_SENT AND PERIOD_NUM>=:START_PERIOD_NUM AND PERIOD_NUM<=:END_PERIOD_NUM', [':IS_SENT' => Period::SEND_FINISH, ':START_PERIOD_NUM' => $this->periodNum + 1, ':END_PERIOD_NUM' => $this->periodNum + 1])->count() == 1) {
-            $this->addError($attribute, '下一期【' . ($this->periodNum + 1) . '】已挂网,该期无法调整');
+            $this->addError($attribute, 'The next period [' . ($this->periodNum + 1) . '] has been connected to the net, and this period cannot be adjusted');
+//            $this->addError($attribute, '下一期【' . ($this->periodNum + 1) . '】已挂网,该期无法调整');
         }
     }
 
@@ -143,7 +145,7 @@ class ChangePerfForm extends Model {
      */
     public function isPerfType($attribute) {
         if (!in_array($this->perfType, array_keys(PerfAudit::CHANGE_PERF_TYPE))) {
-            $this->addError($attribute, '调整类型不正确');
+            $this->addError($attribute, 'The adjustment type is incorrect'); // 调整类型不正确
         }
         $this->_periodNum = Period::sentMaxPeriodNum();
     }
@@ -154,10 +156,10 @@ class ChangePerfForm extends Model {
      */
     public function isLocation($attribute) {
         if ($this->perfType==PerfAudit::PERF_TYPE_PV && !in_array($this->location, [1, 2, 3, 4, 5])) {
-            $this->addError($attribute, '区位不正确');
+            $this->addError($attribute, 'Incorrect location'); // 区位不正确
         }
         if ($this->perfType==PerfAudit::PERF_TYPE_SURPLUS && !in_array($this->location, [1, 2, 3, 4, 5, 6])) {
-            $this->addError($attribute, '区位不正确');
+            $this->addError($attribute, 'Incorrect location'); // 区位不正确
         }
     }
 
@@ -166,21 +168,21 @@ class ChangePerfForm extends Model {
      * @param $attribute
      */
     public function isAmount($attribute) {
-        if ($this->amount == 0) $this->addError($attribute, '变动数额不能为0');
+        if ($this->amount == 0) $this->addError($attribute, 'The amount of change cannot be 0'); // 变动数额不能为0
         if ($this->perfType == PerfAudit::PERF_TYPE_PV) {
             $userPerf = UserPerf::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $this->_userId]);
             if ($this->amount < 0 && (abs($this->amount) > $userPerf['PV_' . $this->location . 'L'])) {
-                $this->addError('scenario', '该会员该区域的数额不足');
+                $this->addError('scenario', 'The member is underrepresented in that region'); // 该会员该区域的数额不足
             }
         } elseif ($this->perfType == PerfAudit::PERF_TYPE_SURPLUS) {
             $perfPeriod = PerfPeriod::findOneAsArray('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', [':USER_ID' => $this->_userId, ':PERIOD_NUM' => $this->_periodNum]);
             if($this->location==6){
                 if ($this->amount < 0 && (abs($this->amount) > $perfPeriod['SURPLUS_LS'])) {
-                    $this->addError('scenario', '该会员当期该区域剩余数额不足');
+                    $this->addError('scenario', 'The member has insufficient surplus in the region for the current period'); // 该会员当期该区域剩余数额不足
                 }
             }else {
                 if ($this->amount < 0 && (abs($this->amount) > $perfPeriod['SURPLUS_' . $this->location . 'L'])) {
-                    $this->addError('scenario', '该会员当期该区域剩余数额不足');
+                    $this->addError('scenario', 'The member has insufficient surplus in the region for the current period'); // 该会员当期该区域剩余数额不足
                 }
             }
         }
@@ -195,20 +197,20 @@ class ChangePerfForm extends Model {
         $oneData = PerfAudit::findOneAsArray(['ID' => $this->id]);
         switch ($this->auditStatus) {
             case 'un':
-                $this->addError($attribute, '不能设置为待审核状态' . $this->auditStatus);
+                $this->addError($attribute, 'Cannot be set to pending review' . $this->auditStatus); // 不能设置为待审核状态
                 break;
             case 'true':
                 if ($oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['true']['value']) {
-                    $this->addError($attribute, '已经审核通过不能重复审核');
+                    $this->addError($attribute, 'The audit has been approved and cannot be repeated'); // 已经审核通过不能重复审核
                 } elseif ($oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['reject']['value']) {
-                    $this->addError($attribute, '已经审核拒绝不能重复审核');
+                    $this->addError($attribute, 'It has been reviewed and rejected and cannot be reviewed again'); // 已经审核拒绝不能重复审核
                 }
                 break;
             case 'reject':
                 if ($oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['true']['value']) {
-                    $this->addError($attribute, '已经审核通过不能重复审核');
+                    $this->addError($attribute, 'The audit has been approved and cannot be repeated'); // 已经审核通过不能重复审核
                 } elseif ($oneData['AUDIT_STATUS'] == \Yii::$app->params['auditStatus']['reject']['value']) {
-                    $this->addError($attribute, '已经审核拒绝不能重复审核');
+                    $this->addError($attribute, 'It has been reviewed and rejected and cannot be reviewed again'); // 已经审核拒绝不能重复审核
                 }
                 break;
             default:
@@ -222,7 +224,7 @@ class ChangePerfForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selected) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
         if (!is_array($this->selected)) {
             $this->selected = [$this->selected];
@@ -409,7 +411,7 @@ class ChangePerfForm extends Model {
         $periodData = $this->adminOperateLogger->saveAfterContent;
         $this->adminOperateLogger->saveAfterContent=array_merge($perfData,$periodData);
         $this->adminOperateLogger->clean()->save([
-            'optType' => '审核通过会员业绩',
+            'optType' => 'Review and approve the performance of members', // 审核通过会员业绩
             'userId' => $model->USER_ID,
             'userName' => Info::getUserNameByUserId($model->USER_ID),
             'remark' => $model->REMARK,
@@ -517,13 +519,13 @@ class ChangePerfForm extends Model {
                 $periodData = $this->adminOperateLogger->saveAfterContent;
                 $this->adminOperateLogger->saveAfterContent=Tool::mergeArrayWithKey($perfData,$periodData);
                 $this->adminOperateLogger->setBatchField('USER_ID')->setOptObjField('USER_ID')->clean()->save([
-                    'optType' => '审核会员业绩',
+                    'optType' => 'Review member performance', // 审核会员业绩
                     'remark' => $this->remark,
                 ]);
             }else{
                 $this->adminOperateLogger->fetchClass = PerfAudit::class;
                 $this->adminOperateLogger->setIsBatch(true)->afterUpdate($this->selected, 'ID')->clean()->save([
-                    'optType' => '审核会员业绩',
+                    'optType' => 'Review member performance', // 审核会员业绩
                     'remark' => $this->remark,
                 ]);
             }
@@ -552,7 +554,7 @@ class ChangePerfForm extends Model {
      */
     public function delete($selected) {
         $this->adminOperateLogger->clean()->save([
-            'optType' => '删除业绩调整待审核数据',
+            'optType' => 'Delete performance adjustment pending review data', // 删除业绩调整待审核数据
         ]);
     }
 }

+ 1 - 1
common/models/forms/ChangeShowEmpLvForm.php

@@ -83,7 +83,7 @@ class ChangeShowEmpLvForm extends Model
     public function isUser($attribute){
         $this->_userId = Info::getUserIdByUserName($this->userName);
         if(!$this->_userId){
-            $this->addError($attribute, '会员不存在');
+            $this->addError($attribute, 'Member does not exist'); // 会员不存在
         }
     }
 

+ 1 - 1
common/models/forms/CloseDecForm.php

@@ -100,7 +100,7 @@ class CloseDecForm extends Model
     public function initUserId($attribute){
         $this->_userId = Info::getUserIdByUserName($this->userName);
         if(!$this->_userId){
-            $this->addError($attribute, '会员不存在');
+            $this->addError($attribute, 'Member does not exist'); // 会员不存在
         }
     }
 

+ 1 - 1
common/models/forms/CloseLoginForm.php

@@ -100,7 +100,7 @@ class CloseLoginForm extends Model
     public function initUserId($attribute){
         $this->_userId = Info::getUserIdByUserName($this->userName);
         if(!$this->_userId){
-            $this->addError($attribute, '会员不存在');
+            $this->addError($attribute, 'Member does not exist'); // 会员不存在
         }
     }
 

+ 1 - 1
common/models/forms/DealTypeForm.php

@@ -72,7 +72,7 @@ class DealTypeForm extends Model {
     public function initModel($attributes) {
         $this->_model = DealType::findOne(['ID' => $this->id]);
         if (!$this->_model) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
     }
 

+ 1 - 1
common/models/forms/DecLevelLogForm.php

@@ -86,7 +86,7 @@ class DecLevelLogForm extends Model
     public function isUser($attribute){
         $this->_userId = Info::getUserIdByUserName($this->userName);
         if(!$this->_userId){
-            $this->addError($attribute, '会员不存在');
+            $this->addError($attribute, 'Member does not exist'); // 会员不存在
         }
     }
 

+ 1 - 1
common/models/forms/DecPackageForm.php

@@ -78,7 +78,7 @@ class DecPackageForm extends Model
      */
     public function isSelected($attributes) {
         if (!$this->selectedIds) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
         if (!is_array($this->selectedIds)) {
             $this->selectedIds = [$this->selectedIds];

+ 1 - 1
common/models/forms/DecRoleLogForm.php

@@ -84,7 +84,7 @@ class DecRoleLogForm extends Model
     public function isUser($attribute){
         $this->_userId = Info::getUserIdByUserName($this->userName);
         if(!$this->_userId){
-            $this->addError($attribute, '会员不存在');
+            $this->addError($attribute, 'Member does not exist'); // 会员不存在
         }
     }
 

+ 2 - 2
common/models/forms/InvoiceAuditForm.php

@@ -105,7 +105,7 @@ class InvoiceAuditForm extends Model {
     public function initModel($attributes) {
         $this->_model = InvoiceAudit::findOne(['ID' => $this->id]);
         if (!$this->_model) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
         if ($this->_model->AUDIT_STATUS != \Yii::$app->params['auditStatus']['un']['value']) {
             $this->addError($attributes, '本数据已经被处理过了');
@@ -119,7 +119,7 @@ class InvoiceAuditForm extends Model {
     public function initWithdrawModel($attributes) {
         $this->_withdrawModel = Withdraw::findOne(['ID' => $this->withdrawId]);
         if (!$this->_withdrawModel) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
         if ($this->_withdrawModel->AUDIT_STATUS != Withdraw::STATUS_APPLIED) {
             $this->addError($attributes, '已审核的提现无法修改发票信息');

+ 2 - 2
common/models/forms/InvoiceBalanceAuditForm.php

@@ -80,7 +80,7 @@ class InvoiceBalanceAuditForm extends Model {
     public function initModel($attributes) {
         $this->_model = InvoiceBalanceAudit::findOne(['ID' => $this->id]);
         if (!$this->_model) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
         if ($this->_model->AUDIT_STATUS != \Yii::$app->params['auditStatus']['un']['value']) {
             $this->addError($attributes, '本数据已经被处理过了');
@@ -106,7 +106,7 @@ class InvoiceBalanceAuditForm extends Model {
             }
             $this->_uid = $userInfo['USER_ID'];
         } else {
-            $this->addError($attributes, '会员不存在');
+            $this->addError($attributes, 'Member does not exist'); // 会员不存在
         }
     }
 

+ 1 - 1
common/models/forms/RechargeForm.php

@@ -117,7 +117,7 @@ class RechargeForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selectedIds) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
 //        if (!is_array($this->selectedIds)) {
 //            $this->selectedIds = [$this->selectedIds];

+ 2 - 2
common/models/forms/ReconsumeForm.php

@@ -106,7 +106,7 @@ class ReconsumeForm extends Model {
         $model = $this->_model = ReconsumeAudit::findOne(['ID' => $this->id]);
         $this->_userId = $model->USER_ID;
         if ($model->AUDIT_STATUS > \Yii::$app->params['auditStatus']['un']['value']) {
-            $this->addError($attribute, '该申请已经被审核,不能重复审核');
+            $this->addError($attribute, 'The application has been reviewed and cannot be reviewed again');// 该申请已经被审核,不能重复审核
         }
     }
 
@@ -155,7 +155,7 @@ class ReconsumeForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selected) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
         if (!is_array($this->selected)) {
             $this->selected = [$this->selected];

+ 2 - 2
common/models/forms/RegInfoAuditForm.php

@@ -98,7 +98,7 @@ class RegInfoAuditForm extends Model {
     public function initModel($attributes) {
         $this->_model = RegInfoAudit::findOne(['ID' => $this->id]);
         if (!$this->_model) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
         if ($this->_model->AUDIT_STATUS != \Yii::$app->params['auditStatus']['un']['value']) {
             $this->addError($attributes, '本数据已经被处理过了');
@@ -121,7 +121,7 @@ class RegInfoAuditForm extends Model {
             }
             $this->_uid = $userInfo['USER_ID'];
         } else {
-            $this->addError($attributes, '会员不存在');
+            $this->addError($attributes, 'Member does not exist'); // 会员不存在
         }
 
     }

+ 1 - 1
common/models/forms/RegTypeForm.php

@@ -61,7 +61,7 @@ class RegTypeForm extends Model {
     public function initModel($attributes) {
         $this->_model = RegType::findOne(['ID' => $this->id]);
         if (!$this->_model) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
     }
 

+ 2 - 2
common/models/forms/ResendQYForm.php

@@ -110,7 +110,7 @@ class ResendQYForm extends Model {
      */
     public function isUser($attribute) {
         if (!$this->_userId = Info::getUserIdByUserName($this->userName)) {
-            $this->addError($attribute, '会员不存在');
+            $this->addError($attribute, 'Member does not exist'); // 会员不存在
         }
     }
 
@@ -149,7 +149,7 @@ class ResendQYForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selectedIds) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
         if (!is_array($this->selectedIds)) {
             $this->selectedIds = [$this->selectedIds];

+ 1 - 1
common/models/forms/SendCFAndLXForm.php

@@ -126,7 +126,7 @@ class SendCFAndLXForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selectedIds) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
         if (!is_array($this->selectedIds)) {
             $this->selectedIds = [$this->selectedIds];

+ 2 - 2
common/models/forms/ShopGoodsForm.php

@@ -113,7 +113,7 @@ class ShopGoodsForm extends Model
     public function initModel($attributes) {
         $this->_model = ShopGoods::findOne(['ID' => $this->id]);
         if (!$this->_model) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
     }
 
@@ -157,7 +157,7 @@ class ShopGoodsForm extends Model
      */
     public function isSelected($attributes) {
         if (!$this->selectedIds) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
         if (!is_array($this->selectedIds)) {
             $this->selectedIds = [$this->selectedIds];

+ 1 - 1
common/models/forms/UserBindForm.php

@@ -84,7 +84,7 @@ class UserBindForm extends Model {
     public function initModel($attributes) {
         $this->_model = UserBind::findOne(['ID' => $this->id]);
         if (!$this->_model) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
         if($this->scenario=='frontEdit'){
             if (Info::getIdCardByUserId(\Yii::$app->user->id) != Info::getIdCardByUserId($this->_model['MAIN_UID'])) {

+ 2 - 2
common/models/forms/UserTeamworkForm.php

@@ -117,7 +117,7 @@ class UserTeamworkForm extends Model {
     public function initModel($attributes) {
         $this->_model = UserTeamwork::findOne(['ID' => $this->id]);
         if (!$this->_model) {
-            $this->addError($attributes, '数据不存在');
+            $this->addError($attributes, 'The data does not exist'); // 数据不存在
         }
     }
 
@@ -145,7 +145,7 @@ class UserTeamworkForm extends Model {
                     $this->addError($attributes, '非正常的会员不允许设置点位合作');
                 }
             } else {
-                $this->addError($attributes, '会员不存在');
+                $this->addError($attributes, 'Member does not exist'); // 会员不存在
             }
         } else {
             if (strpos(strtolower($this->userName), 'hz') !== 0) {

+ 2 - 2
common/models/forms/WithdrawForm.php

@@ -137,7 +137,7 @@ class WithdrawForm extends Model {
             }
             $this->_userId = $userInfo['USER_ID'];
         } else {
-            $this->addError($attributes, $this->userName . '会员不存在');
+            $this->addError($attributes, $this->userName . 'Member does not exist'); // 会员不存在
         }
     }
 
@@ -222,7 +222,7 @@ class WithdrawForm extends Model {
      */
     public function isSelected($attributes) {
         if (!$this->selectedIds) {
-            $this->addError($attributes, '必须选择一条数据');
+            $this->addError($attributes, 'A piece of data must be selected'); // 必须选择一条数据
         }
         if (!is_array($this->selectedIds)) {
             $this->selectedIds = [$this->selectedIds];

+ 5 - 5
frontendApi/modules/v1/controllers/BonusController.php

@@ -770,7 +770,7 @@ class BonusController extends BaseController {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         } else {
-            return static::notice('非法请求', 400);
+            return static::notice('Illegal request', 400); // 非法请求
         }
     }
 
@@ -790,7 +790,7 @@ class BonusController extends BaseController {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         } else {
-            return static::notice('非法请求', 400);
+            return static::notice('Illegal request', 400); // 非法请求
         }
     }
 
@@ -865,7 +865,7 @@ class BonusController extends BaseController {
         $id = \Yii::$app->request->get('id');
         $withdraw = Withdraw::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$withdraw) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         $uploadInvoiceTip = Cache::getSystemConfig()['uploadInvoiceTip']['VALUE'];
         if ($withdraw['AUDIT_STATUS'] == Withdraw::STATUS_APPLIED) {
@@ -885,7 +885,7 @@ class BonusController extends BaseController {
         $id = \Yii::$app->request->get('id');
         $withdraw = Withdraw::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$withdraw) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         if (\Yii::$app->request->isPost) {
             $formModel = new UploadForm();
@@ -912,7 +912,7 @@ class BonusController extends BaseController {
         $id = \Yii::$app->request->get('id');
         $uploads = Uploads::findOneAsArray('ID=:ID', [':ID' => $id],'URL');
         if (!$uploads) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         return static::notice($uploads['URL']);
     }

+ 6 - 6
frontendApi/modules/v1/controllers/FinanceController.php

@@ -134,7 +134,7 @@ class FinanceController extends BaseController {
             return $rtn;
 
         } else {
-            return static::notice('非法请求', 400);
+            return static::notice('Illegal request', 400); // 非法请求
         }
     }
 
@@ -158,7 +158,7 @@ class FinanceController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionWithdrawBack() {
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
         if (\Yii::$app->request->isPost) {
             $formModel = new WithdrawForm();
             $formModel->scenario = 'backByUser';
@@ -168,7 +168,7 @@ class FinanceController extends BaseController {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         } else {
-            return static::notice('非法请求', 400);
+            return static::notice('Illegal request', 400); // 非法请求
         }
     }
 
@@ -250,7 +250,7 @@ class FinanceController extends BaseController {
         $id = \Yii::$app->request->get('id');
         $withdraw = Withdraw::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$withdraw) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         $uploadInvoiceTip = Cache::getSystemConfig()['uploadInvoiceTip']['VALUE'];
         if ($withdraw['AUDIT_STATUS'] == Withdraw::STATUS_APPLIED) {
@@ -270,7 +270,7 @@ class FinanceController extends BaseController {
         $id = \Yii::$app->request->get('id');
         $withdraw = Withdraw::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$withdraw) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         if (\Yii::$app->request->isPost) {
             $formModel = new UploadForm();
@@ -297,7 +297,7 @@ class FinanceController extends BaseController {
         $id = \Yii::$app->request->get('id');
         $uploads = Uploads::findOneAsArray('ID=:ID', [':ID' => $id],'URL');
         if (!$uploads) {
-            return static::notice('数据不存在', 400);
+            return static::notice('The data does not exist', 400); // 数据不存在
         }
         return static::notice($uploads['URL']);
     }

+ 1 - 1
frontendApi/modules/v1/controllers/OauthController.php

@@ -179,7 +179,7 @@ class OauthController extends BaseController
                 return static::notice($result);
             }
         }
-        return static::notice('非法请求', 400);
+        return static::notice('Illegal request', 400); // 非法请求
     }
 
     /**