|
|
@@ -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']]);
|
|
|
}
|