Skip to content

杨树贤 / ic_server_welfare

Go to a project
Commit 5ee03948 by 杨树贤
Options

修改错误码,整理错误码

parent 289abc04
Expand all
Inline Side-by-side
Showing with 46 additions and 43 deletions
app/Http/Controllers/ExchangeSettingsController.php
...@@ -31,7 +31,7 @@ class ExchangeSettingsController extends Controller ...@@ -31,7 +31,7 @@ class ExchangeSettingsController extends Controller
} }
/** /**
* 红包兑换项列表 * 红包商品兑换项列表
* @param Request $request * @param Request $request
* @param ExchangeSetting $exchangeSetting * @param ExchangeSetting $exchangeSetting
* @param ExchangeSettingFilter $filter * @param ExchangeSettingFilter $filter
...@@ -49,7 +49,7 @@ class ExchangeSettingsController extends Controller ...@@ -49,7 +49,7 @@ class ExchangeSettingsController extends Controller
/** /**
* 存储新增的红包配置项 * 存储新增的兑换商品项目
* @param Request $request * @param Request $request
* @param ExchangeSetting $exchangeSetting * @param ExchangeSetting $exchangeSetting
* @return array * @return array
...@@ -68,12 +68,12 @@ class ExchangeSettingsController extends Controller ...@@ -68,12 +68,12 @@ class ExchangeSettingsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(ErrorCode(041, 5), '新增红包配置项失败'); return $this->Export(ErrorCode(11, 5), '新增兑换商品项目失败');
} }
} }
/** /**
* 更新红包配置项 * 更新兑换商品项目
* @param Request $request * @param Request $request
* @param ExchangeSetting $exchangeSetting * @param ExchangeSetting $exchangeSetting
* @return array * @return array
...@@ -91,7 +91,7 @@ class ExchangeSettingsController extends Controller ...@@ -91,7 +91,7 @@ class ExchangeSettingsController extends Controller
]; ];
$res = $exchangeSetting->updateExchangeSetting($id, $data); $res = $exchangeSetting->updateExchangeSetting($id, $data);
if (!$res) { if (!$res) {
return $this->Export(042, '更新红包配置项失败'); return $this->Export(12, '更新兑换商品项目失败');
} else { } else {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} }
...@@ -117,12 +117,12 @@ class ExchangeSettingsController extends Controller ...@@ -117,12 +117,12 @@ class ExchangeSettingsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(045, '修改配置项可使用状态失败'); return $this->Export(14, '修改兑换商品项目可使用状态失败');
} }
} }
/** /**
* 删除红包配置项 * 删除兑换商品项目
* @param Request $request * @param Request $request
* @param ExchangeSetting $exchangeSetting * @param ExchangeSetting $exchangeSetting
* @return array * @return array
...@@ -135,12 +135,12 @@ class ExchangeSettingsController extends Controller ...@@ -135,12 +135,12 @@ class ExchangeSettingsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(ErrorCode(043, 5), '删除红包配置项失败'); return $this->Export(ErrorCode(13, 5), '删除兑换商品项目失败');
} }
} }
/** /**
* 批量更新红包配置项状态 * 批量更新兑换商品项目状态
* @param Request $request * @param Request $request
* @param ExchangeSetting $exchangeSetting * @param ExchangeSetting $exchangeSetting
* @return array * @return array
...@@ -156,7 +156,7 @@ class ExchangeSettingsController extends Controller ...@@ -156,7 +156,7 @@ class ExchangeSettingsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(ErrorCode(044, 5), '删除红包配置项失败'); return $this->Export(ErrorCode(15, 5), '批量更新兑换商品项目可使用状态失败');
} }
} }
} }
\ No newline at end of file
app/Http/Controllers/IntegralBillsController.php
...@@ -33,7 +33,7 @@ class IntegralBillsController extends Controller ...@@ -33,7 +33,7 @@ class IntegralBillsController extends Controller
} }
/** /**
* 创建红包账单 * 创建红包获取记录
* @param Request $request * @param Request $request
* @param IntegralBill $integralBill * @param IntegralBill $integralBill
* @return array * @return array
...@@ -52,12 +52,12 @@ class IntegralBillsController extends Controller ...@@ -52,12 +52,12 @@ class IntegralBillsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(ErrorCode(021, 5), '新增红包兑换记录失败'); return $this->Export(ErrorCode(6, 5), '新增红包获取记录失败');
} }
} }
/** /**
* 更新红包账单 * 更新红包获取记录
* @param Request $request * @param Request $request
* @param IntegralBill $integralBill * @param IntegralBill $integralBill
* @return array * @return array
...@@ -77,12 +77,12 @@ class IntegralBillsController extends Controller ...@@ -77,12 +77,12 @@ class IntegralBillsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(ErrorCode(022, 5), '更新红包账单失败'); return $this->Export(ErrorCode(7, 5), '更新红包获取记录失败');
} }
} }
/** /**
* 删除红包账单 * 删除红包获取记录
* @param Request $request * @param Request $request
* @param IntegralBill $integralBill * @param IntegralBill $integralBill
* @return array * @return array
...@@ -95,7 +95,7 @@ class IntegralBillsController extends Controller ...@@ -95,7 +95,7 @@ class IntegralBillsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(ErrorCode(023, 5), '删除红包账单失败'); return $this->Export(ErrorCode(8, 5), '删除红包获取记录失败');
} }
} }
} }
\ No newline at end of file
app/Http/Controllers/IntegralsController.php
...@@ -67,7 +67,7 @@ class IntegralsController extends Controller ...@@ -67,7 +67,7 @@ class IntegralsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(ErrorCode(001, 5), '新增红包信息失败'); return $this->Export(ErrorCode(1, 5), '新增红包信息失败');
} }
} }
...@@ -92,6 +92,24 @@ class IntegralsController extends Controller ...@@ -92,6 +92,24 @@ class IntegralsController extends Controller
if (!$res) { if (!$res) {
return $this->Export(002, '更新红包信息失败'); return $this->Export(002, '更新红包信息失败');
} else { } else {
return $this->Export(2, 'ok');
}
}
/**
* 删除红包
* @param Request $request
* @param Integral $integral
* @return array
*/
public function destroy(Request $request,Integral $integral)
{
$ids = $request->ids;
$ids = explode(',', trim($ids));
$res = $integral->deleteIntegral($ids);
if (!$res) {
return $this->Export(ErrorCode(3, 5), '删除红包信息失败');
} else {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} }
} }
...@@ -115,7 +133,7 @@ class IntegralsController extends Controller ...@@ -115,7 +133,7 @@ class IntegralsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(005, '修改红包可使用状态失败'); return $this->Export(5, '修改红包可使用状态失败');
} }
} }
...@@ -136,25 +154,7 @@ class IntegralsController extends Controller ...@@ -136,25 +154,7 @@ class IntegralsController extends Controller
$res = $integral->batchUpdateStatus($ids, $data); $res = $integral->batchUpdateStatus($ids, $data);
if (!$res) { if (!$res) {
return $this->Export(004, '批量更新红包信息状态失败'); return $this->Export(4, '批量更新红包可使用状态失败');
} else {
return $this->Export(0, 'ok');
}
}
/**
* 删除红包
* @param Request $request
* @param Integral $integral
* @return array
*/
public function destroy(Request $request,Integral $integral)
{
$ids = $request->ids;
$ids = explode(',', trim($ids));
$res = $integral->deleteIntegral($ids);
if (!$res) {
return $this->Export(ErrorCode(003, 5), '删除红包信息失败');
} else { } else {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} }
......
app/Http/Controllers/UserExchangesController.php
...@@ -68,7 +68,7 @@ class UserExchangesController extends Controller ...@@ -68,7 +68,7 @@ class UserExchangesController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(033, '审核用户兑换失败'); return $this->Export(16, '审核用户兑换失败');
} }
} }
...@@ -96,7 +96,7 @@ class UserExchangesController extends Controller ...@@ -96,7 +96,7 @@ class UserExchangesController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(032, '批量更新用户兑换红包信息状态失败'); return $this->Export(17, '审核批量拒绝兑换失败');
} }
} }
} }
\ No newline at end of file
app/Http/Controllers/UserIntegralsController.php
...@@ -69,7 +69,7 @@ class UserIntegralsController extends Controller ...@@ -69,7 +69,7 @@ class UserIntegralsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(011, '修改用户红包可领取状态失败'); return $this->Export(9, '修改用户红包可领取状态失败');
} }
} }
...@@ -92,7 +92,7 @@ class UserIntegralsController extends Controller ...@@ -92,7 +92,7 @@ class UserIntegralsController extends Controller
if ($res) { if ($res) {
return $this->Export(0, 'ok'); return $this->Export(0, 'ok');
} else { } else {
return $this->Export(012, '批量修改用户是否可领取红包失败'); return $this->Export(10, '批量修改用户是否可领取红包失败');
} }
} }
......
storage/laravels.pid
18264 25778
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment