Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
ic_server_welfare
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
48660cee
authored
Aug 21, 2019
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
将数据库操作挪到model里面,同时删除多余的业务
parent
01a0b3ba
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
211 additions
and
180 deletions
app/Http/Controllers/ExchangeSettingsController.php
app/Http/Controllers/IntegralTypesController.php
app/Http/Controllers/IntegralsController.php
app/Http/Controllers/UserExchangesController.php
app/Http/Controllers/UserIntegralsController.php
app/Models/ExchangeSetting.php
app/Models/Integral.php
app/Models/IntegralType.php
app/Models/UserExchange.php
app/Models/UserIntegral.php
storage/laravels.json
storage/laravels.pid
app/Http/Controllers/ExchangeSettingsController.php
View file @
48660cee
...
...
@@ -17,7 +17,6 @@ use Illuminate\Support\Facades\Log;
*/
class
ExchangeSettingsController
extends
Controller
{
/**
* 单个红包兑换项详细信息
* @param Request $request
...
...
@@ -34,40 +33,38 @@ class ExchangeSettingsController extends Controller
/**
* 红包兑换项列表
* @param Request $request
* @param ExchangeSetting $exchangeSetting
* @param ExchangeSettingFilter $filter
* @return array
*/
public
function
index
(
Request
$request
,
ExchangeSettingFilter
$filter
)
public
function
index
(
Request
$request
,
ExchangeSetting
$exchangeSetting
,
ExchangeSetting
Filter
$filter
)
{
$page
=
$request
->
has
(
'page'
)
?
$request
->
page
:
self
::
DEFAULT_PAGE
;
$page
_s
ize
=
$request
->
has
(
'page_size'
)
?
$request
->
page_size
:
self
::
DEFAULT_PAGE_SIZE
;
$page
S
ize
=
$request
->
has
(
'page_size'
)
?
$request
->
page_size
:
self
::
DEFAULT_PAGE_SIZE
;
$settings
=
ExchangeSetting
::
filter
(
$filter
)
->
page
(
$page
,
$page_size
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
$count
=
ExchangeSetting
::
filter
(
$filter
)
->
count
();
$result
=
$exchangeSetting
->
getExchangeSettingList
(
$page
,
$pageSize
,
$filter
);
return
$this
->
Export
(
0
,
'ok'
,
[
'data'
=>
$settings
,
'count'
=>
$count
]
);
return
$this
->
Export
(
0
,
'ok'
,
$result
);
}
/**
* 存储新增的红包配置项
* @param Request $request
* @param ExchangeSetting $exchangeSetting
* @return array
*/
public
function
store
(
Request
$request
)
public
function
store
(
Request
$request
,
ExchangeSetting
$exchangeSetting
)
{
$
res
=
DB
::
table
(
'exchange_settings'
)
->
insert
(
[
$
data
=
[
'name'
=>
$request
->
name
,
'stock'
=>
$request
->
stock
,
'amount'
=>
$request
->
amount
,
'type'
=>
$request
->
type
,
'add_time'
=>
time
(),
'status'
=>
$request
->
status
,
]
)
;
];
$res
=
$exchangeSetting
->
addExchangeSetting
(
$data
);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
...
...
@@ -78,9 +75,10 @@ class ExchangeSettingsController extends Controller
/**
* 更新红包配置项
* @param Request $request
* @param ExchangeSetting $exchangeSetting
* @return array
*/
public
function
update
(
Request
$request
)
public
function
update
(
Request
$request
,
ExchangeSetting
$exchangeSetting
)
{
$id
=
$request
->
id
;
$data
=
[
...
...
@@ -91,8 +89,7 @@ class ExchangeSettingsController extends Controller
'status'
=>
$request
->
status
,
'update_time'
=>
time
(),
];
$res
=
DB
::
table
(
'exchange_settings'
)
->
where
(
'id'
,
$id
)
->
update
(
$data
);
$res
=
$exchangeSetting
->
updateExchangeSetting
(
$id
,
$data
);
if
(
!
$res
)
{
return
$this
->
Export
(
042
,
'更新红包配置项失败'
);
}
else
{
...
...
@@ -104,9 +101,10 @@ class ExchangeSettingsController extends Controller
/**
* 修改配置项是否可用状态
* @param Request $request
* @param ExchangeSetting $exchangeSetting
* @return array
*/
public
function
updateStatus
(
Request
$request
)
public
function
updateStatus
(
Request
$request
,
ExchangeSetting
$exchangeSetting
)
{
$id
=
$request
->
id
;
$status
=
$request
->
status
;
...
...
@@ -114,8 +112,7 @@ class ExchangeSettingsController extends Controller
'status'
=>
$status
,
'update_time'
=>
time
(),
];
$res
=
DB
::
table
(
'exchange_settings'
)
->
where
(
'id'
,
$id
)
->
update
(
$data
);
$res
=
$exchangeSetting
->
updateExchangeSetting
(
$id
,
$data
);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
...
...
@@ -127,13 +124,14 @@ class ExchangeSettingsController extends Controller
/**
* 删除红包配置项
* @param Request $request
* @param ExchangeSetting $exchangeSetting
* @return array
*/
public
function
destroy
(
Request
$request
)
public
function
destroy
(
Request
$request
,
ExchangeSetting
$exchangeSetting
)
{
$ids
=
$request
->
ids
;
$ids
=
explode
(
','
,
trim
(
$ids
));
$res
=
DB
::
table
(
'exchange_settings'
)
->
whereIn
(
'id'
,
$ids
)
->
delete
(
);
$res
=
$exchangeSetting
->
deleteExchangeSetting
(
$ids
);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
...
...
@@ -144,19 +142,17 @@ class ExchangeSettingsController extends Controller
/**
* 批量更新红包配置项状态
* @param Request $request
* @param ExchangeSetting $exchangeSetting
* @return array
*/
public
function
batchUpdateStatus
(
Request
$request
)
public
function
batchUpdateStatus
(
Request
$request
,
ExchangeSetting
$exchangeSetting
)
{
$ids
=
$request
->
ids
;
if
(
!
is_array
(
$ids
))
{
return
Log
::
Info
(
'批量修改参数不是数组'
);
}
$status
=
$request
->
status
;
$res
=
DB
::
table
(
'exchange_settings'
)
->
whereIn
(
'id'
,
$ids
)
->
update
([
'status'
=>
(
int
)
$status
,
'update_time'
=>
time
()]);
$res
=
$exchangeSetting
->
batchUpdateStatus
(
$status
,
$ids
);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
...
...
app/Http/Controllers/IntegralTypesController.php
deleted
100644 → 0
View file @
01a0b3ba
<?php
namespace
App\Http\Controllers
;
use
App\Models\IntegralType
;
use
Illuminate\Http\Request
;
use
Illuminate\Support\Facades\DB
;
/**
* 红包类型管理
* Class IntegralTypesController
* @package App\Http\Controllers
*/
class
IntegralTypesController
extends
Controller
{
/**红包类型列表
* @return array
*/
public
function
index
()
{
$integrals
=
IntegralType
::
all
()
->
toArray
();
return
$this
->
Export
(
0
,
'ok'
,
[
'data'
=>
$integrals
]);
}
/**
* 创建红包类型
* @param Request $request
* @return array
*/
public
function
create
(
Request
$request
)
{
$res
=
DB
::
table
(
'integral_types'
)
->
insert
([
'name'
=>
$request
->
name
,
'add_time'
=>
time
(),
'status'
=>
1
,
]);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
return
$this
->
Export
(
ErrorCode
(
011
,
5
),
'新增红包分类失败'
);
}
}
/**
* 更新红包类型
* @param Request $request
* @return array
*/
public
function
update
(
Request
$request
)
{
$id
=
$request
->
id
;
$res
=
DB
::
table
(
'integral_types'
)
->
where
(
'id'
,
$id
)
->
update
([
'name'
=>
$request
->
name
,
'status'
=>
$request
->
status
,
]);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
return
$this
->
Export
(
ErrorCode
(
012
,
5
),
'更新红包分类失败'
);
}
}
/**
* 删除红包类型
* @param Request $request
* @return array
*/
public
function
destroy
(
Request
$request
)
{
$ids
=
$request
->
ids
;
$ids
=
explode
(
','
,
trim
(
$ids
));
$res
=
DB
::
table
(
'integral_types'
)
->
whereIn
(
'id'
,
$ids
)
->
delete
();
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
return
$this
->
Export
(
ErrorCode
(
013
,
5
),
'删除红包分类失败'
);
}
}
}
\ No newline at end of file
app/Http/Controllers/IntegralsController.php
View file @
48660cee
...
...
@@ -33,39 +33,37 @@ class IntegralsController extends Controller
/**
* 红包列表
* @param Request $request
* @param Integral $integral
* @param IntegralFilter $filter
* @return array
*/
public
function
index
(
Request
$request
,
IntegralFilter
$filter
)
public
function
index
(
Request
$request
,
Integral
$integral
,
Integral
Filter
$filter
)
{
$page
=
$request
->
has
(
'page'
)
?
$request
->
page
:
self
::
DEFAULT_PAGE
;
$page
_s
ize
=
$request
->
has
(
'page_size'
)
?
$request
->
page_size
:
self
::
DEFAULT_PAGE_SIZE
;
$page
S
ize
=
$request
->
has
(
'page_size'
)
?
$request
->
page_size
:
self
::
DEFAULT_PAGE_SIZE
;
$integrals
=
Integral
::
with
(
'integralType:id,name'
)
->
filter
(
$filter
)
->
page
(
$page
,
$page_size
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
$count
=
Integral
::
count
();
$result
=
$integral
->
getIntegralList
(
$page
,
$pageSize
,
$filter
);
return
$this
->
Export
(
0
,
'ok'
,
[
'data'
=>
$integrals
,
'count'
=>
$count
]
);
return
$this
->
Export
(
0
,
'ok'
,
$result
);
}
/**
* 创建红包
* @param Request $request
* @param Integral $integral
* @return array
*/
public
function
create
(
Request
$request
)
public
function
create
(
Request
$request
,
Integral
$integral
)
{
$
res
=
DB
::
table
(
'integrals'
)
->
insert
(
[
$
data
=
[
'name'
=>
$request
->
name
,
'daily_limit'
=>
$request
->
daily_limit
,
'amount'
=>
$request
->
amount
,
'add_time'
=>
time
(),
'status'
=>
$request
->
status
,
]
)
;
];
$res
=
$integral
->
addIntegral
(
$data
);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
...
...
@@ -76,9 +74,10 @@ class IntegralsController extends Controller
/**
* 更新红包
* @param Request $request
* @param Integral $integral
* @return array
*/
public
function
update
(
Request
$request
)
public
function
update
(
Request
$request
,
Integral
$integral
)
{
$id
=
$request
->
id
;
$data
=
[
...
...
@@ -88,8 +87,8 @@ class IntegralsController extends Controller
'daily_limit'
=>
$request
->
daily_limit
,
'update_time'
=>
time
(),
];
$res
=
DB
::
table
(
'integrals'
)
->
where
(
'id'
,
$id
)
->
update
(
$data
);
$res
=
$integral
->
updateIntegral
(
$id
,
$data
);
if
(
!
$res
)
{
return
$this
->
Export
(
002
,
'更新红包信息失败'
);
}
else
{
...
...
@@ -100,9 +99,10 @@ class IntegralsController extends Controller
/**
* 更新红包是否可用状态
* @param Request $request
* @param Integral $integral
* @return array
*/
public
function
updateStatus
(
Request
$request
)
public
function
updateStatus
(
Request
$request
,
Integral
$integral
)
{
$id
=
$request
->
id
;
$status
=
$request
->
status
;
...
...
@@ -110,9 +110,8 @@ class IntegralsController extends Controller
'status'
=>
$status
,
'update_time'
=>
time
(),
];
$res
=
DB
::
table
(
'integrals'
)
->
where
(
'id'
,
$id
)
->
update
(
$data
);
$res
=
$integral
->
updateIntegral
(
$id
,
$data
);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
...
...
@@ -123,18 +122,18 @@ class IntegralsController extends Controller
/**
* 批量更改状态
* @param Request $request
* @param Integral $integral
* @return array
*/
public
function
batchUpdateStatus
(
Request
$request
)
public
function
batchUpdateStatus
(
Request
$request
,
Integral
$integral
)
{
$ids
=
$request
->
ids
;
if
(
!
is_array
(
$ids
))
{
return
Log
::
Info
(
'批量修改参数不是数组'
);
}
$status
=
$request
->
status
;
$res
=
DB
::
table
(
'integrals'
)
->
whereIn
(
'id'
,
$ids
)
->
update
([
'status'
=>
(
int
)
$status
,
'update_time'
=>
time
()]);
$data
=
[
'status'
=>
$status
,
'update_time'
=>
time
()];
$res
=
$integral
->
batchUpdateStatus
(
$ids
,
$data
);
if
(
!
$res
)
{
return
$this
->
Export
(
004
,
'批量更新红包信息状态失败'
);
...
...
@@ -146,13 +145,14 @@ class IntegralsController extends Controller
/**
* 删除红包
* @param Request $request
* @param Integral $integral
* @return array
*/
public
function
destroy
(
Request
$request
)
public
function
destroy
(
Request
$request
,
Integral
$integral
)
{
$ids
=
$request
->
ids
;
$ids
=
explode
(
','
,
trim
(
$ids
));
$res
=
DB
::
table
(
'integrals'
)
->
whereIn
(
'id'
,
$ids
)
->
delete
(
);
$res
=
$integral
->
deleteIntegral
(
$ids
);
if
(
!
$res
)
{
return
$this
->
Export
(
ErrorCode
(
003
,
5
),
'删除红包信息失败'
);
}
else
{
...
...
app/Http/Controllers/UserExchangesController.php
View file @
48660cee
...
...
@@ -32,21 +32,18 @@ class UserExchangesController extends Controller
/**
* 用户兑换红包列表
* @param Request $request
* @param UserExchange $userExchange
* @param UserExchangeFilter $filter
* @return array
*/
public
function
index
(
Request
$request
,
UserExchangeFilter
$filter
)
public
function
index
(
Request
$request
,
UserExchange
$userExchange
,
UserExchange
Filter
$filter
)
{
$page
=
$request
->
has
(
'page'
)
?
$request
->
page
:
self
::
DEFAULT_PAGE
;
$pageSize
=
$request
->
has
(
'page_size'
)
?
$request
->
page_size
:
self
::
DEFAULT_PAGE_SIZE
;
$userExchanges
=
UserExchange
::
with
([
'exchange_setting'
,
'user_integral'
])
->
filter
(
$filter
)
->
page
(
$page
,
$pageSize
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
$count
=
UserExchange
::
filter
(
$filter
)
->
count
();
$res
=
$userExchange
->
getUserExchangeList
(
$page
,
$pageSize
,
$filter
);
return
$this
->
Export
(
0
,
'ok'
,
[
'data'
=>
$userExchanges
,
'count'
=>
$count
]
);
return
$this
->
Export
(
0
,
'ok'
,
$res
);
}
...
...
@@ -78,6 +75,7 @@ class UserExchangesController extends Controller
/**
* 批量审核
* @param Request $request
* @param UserExchange $userExchange
* @return array
*/
public
function
batchAuditReject
(
Request
$request
,
UserExchange
$userExchange
)
...
...
app/Http/Controllers/UserIntegralsController.php
View file @
48660cee
...
...
@@ -8,7 +8,6 @@ use App\Http\Filters\UserIntegralFilter;
use
App\Models\IntegralBill
;
use
App\Models\UserIntegral
;
use
Illuminate\Http\Request
;
use
Illuminate\Support\Facades\DB
;
use
Illuminate\Support\Facades\Log
;
/**
...
...
@@ -37,62 +36,63 @@ class UserIntegralsController extends Controller
/**
* 用户红包详情列表
* @param Request $request
* @param UserIntegral $userIntegral
* @param UserIntegralFilter $filter
* @return array
*/
public
function
index
(
Request
$request
,
UserIntegralFilter
$filter
)
public
function
index
(
Request
$request
,
UserIntegral
$userIntegral
,
UserIntegral
Filter
$filter
)
{
$integrals
=
UserIntegral
::
filter
(
$filter
)
->
page
(
$request
->
page
,
$request
->
page_size
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
$count
=
UserIntegral
::
filter
(
$filter
)
->
count
();
$page
=
$request
->
has
(
'page'
)
?
$request
->
page
:
self
::
DEFAULT_PAGE
;
$pageSize
=
$request
->
has
(
'page_size'
)
?
$request
->
page_size
:
self
::
DEFAULT_PAGE_SIZE
;
return
$this
->
Export
(
0
,
'ok'
,
[
'data'
=>
$integrals
,
'count'
=>
$count
]);
$res
=
$userIntegral
->
getUserIntegralList
(
$page
,
$pageSize
,
$filter
);
return
$this
->
Export
(
0
,
'ok'
,
$res
);
}
/**
* 更新用户红包可领取状态
* @param Request $request
* @param UserIntegral $userIntegral
* @return array
*/
public
function
updateStatus
(
Request
$request
)
public
function
updateStatus
(
Request
$request
,
UserIntegral
$userIntegral
)
{
$id
=
$request
->
id
;
$status
=
$request
->
status
;
$data
=
[
'status'
=>
$status
,
'status'
=>
$
request
->
status
,
'update_time'
=>
time
(),
];
$res
=
DB
::
table
(
'user_integrals'
)
->
where
(
'id'
,
$id
)
->
update
(
$data
);
$res
=
$userIntegral
->
updateUserIntegral
(
$id
,
$data
);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
return
$this
->
Export
(
0
5
1
,
'修改用户红包可领取状态失败'
);
return
$this
->
Export
(
0
1
1
,
'修改用户红包可领取状态失败'
);
}
}
/**
* 批量修改用户是否能够领取红包
* @param Request $request
* @param UserIntegral $userIntegral
* @return array
*/
public
function
batchUpdateStatus
(
Request
$request
)
public
function
batchUpdateStatus
(
Request
$request
,
UserIntegral
$userIntegral
)
{
$ids
=
$request
->
ids
;
if
(
!
is_array
(
$ids
))
{
return
Log
::
Info
(
'批量修改参数不是数组'
);
}
$status
=
$request
->
status
;
$res
=
DB
::
table
(
'user_integrals'
)
->
whereIn
(
'id'
,
$ids
)
->
update
([
'status'
=>
(
int
)
$status
,
'update_time'
=>
time
()]);
$data
=
[
'status'
=>
(
int
)
$request
->
status
,
'update_time'
=>
time
()];
$res
=
$userIntegral
->
batchUpdateStatus
(
$ids
,
$data
);
if
(
$res
)
{
return
$this
->
Export
(
0
,
'ok'
);
}
else
{
return
$this
->
Export
(
0
5
2
,
'批量修改用户是否可领取红包失败'
);
return
$this
->
Export
(
0
1
2
,
'批量修改用户是否可领取红包失败'
);
}
}
...
...
app/Models/ExchangeSetting.php
View file @
48660cee
...
...
@@ -6,6 +6,7 @@ namespace App\Models;
use
App\Http\Filters\QueryFilter
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Support\Facades\DB
;
class
ExchangeSetting
extends
Model
{
...
...
@@ -20,4 +21,54 @@ class ExchangeSetting extends Model
{
return
$filters
->
apply
(
$query
);
}
public
function
getExchangeSettingList
(
$page
,
$pageSize
,
$filter
)
{
$settings
=
ExchangeSetting
::
filter
(
$filter
)
->
page
(
$page
,
$pageSize
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
$count
=
ExchangeSetting
::
filter
(
$filter
)
->
count
();
return
[
'data'
=>
$settings
,
'count'
=>
$count
];
}
public
function
addExchangeSetting
(
$data
=
[])
{
$result
=
DB
::
table
(
'exchange_settings'
)
->
insert
(
$data
);
return
$result
;
}
public
function
updateExchangeSetting
(
$id
,
$data
=
[])
{
$result
=
DB
::
table
(
'exchange_settings'
)
->
where
(
'id'
,
$id
)
->
update
(
$data
);
return
$result
;
}
public
function
deleteExchangeSetting
(
$ids
=
[])
{
$res
=
DB
::
table
(
'exchange_settings'
)
->
whereIn
(
'id'
,
$ids
)
->
delete
();
return
$res
;
}
/**
* 批量修改状态
* @param $status
* @param array $ids
* @return bool
*/
public
function
batchUpdateStatus
(
$status
,
$ids
=
[])
{
$res
=
DB
::
table
(
'exchange_settings'
)
->
whereIn
(
'id'
,
$ids
)
->
update
([
'status'
=>
(
int
)
$status
,
'update_time'
=>
time
()]);
return
$res
;
}
}
\ No newline at end of file
app/Models/Integral.php
View file @
48660cee
...
...
@@ -6,6 +6,7 @@ namespace App\Models;
use
App\Http\Filters\QueryFilter
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Support\Facades\DB
;
class
Integral
extends
Model
{
...
...
@@ -27,4 +28,45 @@ class Integral extends Model
{
return
$this
->
belongsTo
(
IntegralType
::
class
,
'integral_type_id'
,
'id'
);
}
public
function
getIntegralList
(
$page
,
$pageSize
,
$filter
)
{
$integrals
=
Integral
::
with
(
'integralType:id,name'
)
->
filter
(
$filter
)
->
page
(
$page
,
$pageSize
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
$count
=
Integral
::
count
();
return
[
'data'
=>
$integrals
,
'count'
=>
$count
];
}
public
function
addIntegral
(
$data
=
[])
{
$res
=
DB
::
table
(
'integrals'
)
->
insert
(
$data
);
return
$res
;
}
public
function
updateIntegral
(
$id
,
$data
=
[])
{
$res
=
DB
::
table
(
'integrals'
)
->
where
(
'id'
,
$id
)
->
update
(
$data
);
return
$res
;
}
public
function
batchUpdateStatus
(
$ids
=
[],
$data
=
[])
{
$res
=
DB
::
table
(
'integrals'
)
->
whereIn
(
'id'
,
$ids
)
->
update
(
$data
);
return
$res
;
}
public
function
deleteIntegral
(
$ids
=
[])
{
$res
=
DB
::
table
(
'integrals'
)
->
whereIn
(
'id'
,
$ids
)
->
delete
();
return
$res
;
}
}
\ No newline at end of file
app/Models/IntegralType.php
deleted
100644 → 0
View file @
01a0b3ba
<?php
namespace
App\Models
;
use
Illuminate\Database\Eloquent\Model
;
class
IntegralType
extends
Model
{
public
$timestamps
=
false
;
protected
$fillable
=
[
'name'
,
'status'
];
}
\ No newline at end of file
app/Models/UserExchange.php
View file @
48660cee
...
...
@@ -33,6 +33,18 @@ class UserExchange extends Model
}
public
function
getUserExchangeList
(
$page
,
$pageSize
,
$filter
)
{
$userExchanges
=
UserExchange
::
with
([
'exchange_setting'
,
'user_integral'
])
->
filter
(
$filter
)
->
page
(
$page
,
$pageSize
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
$count
=
UserExchange
::
filter
(
$filter
)
->
count
();
return
[
'data'
=>
$userExchanges
,
'count'
=>
$count
];
}
//审核用户的兑换
public
function
auditUserExchange
(
$id
,
$exchangedAmount
,
$data
=
[])
{
...
...
app/Models/UserIntegral.php
View file @
48660cee
...
...
@@ -6,6 +6,7 @@ namespace App\Models;
use
App\Http\Filters\QueryFilter
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Support\Facades\DB
;
class
UserIntegral
extends
Model
{
...
...
@@ -20,4 +21,32 @@ class UserIntegral extends Model
{
return
$filters
->
apply
(
$query
);
}
public
function
getUserIntegralList
(
$page
,
$pageSize
,
$filter
)
{
$settings
=
UserIntegral
::
filter
(
$filter
)
->
page
(
$page
,
$pageSize
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
$count
=
UserIntegral
::
filter
(
$filter
)
->
count
();
return
[
'data'
=>
$settings
,
'count'
=>
$count
];
}
public
function
updateUserIntegral
(
$id
,
$data
=
[])
{
$res
=
DB
::
table
(
'user_integrals'
)
->
where
(
'id'
,
$id
)
->
update
(
$data
);
return
$res
;
}
public
function
batchUpdateStatus
(
$ids
=
[],
$data
=
[])
{
$res
=
DB
::
table
(
'user_integrals'
)
->
whereIn
(
'id'
,
$ids
)
->
update
(
$data
);
return
$res
;
}
}
\ No newline at end of file
storage/laravels.json
View file @
48660cee
{
"server"
:{
"listen_ip"
:
"0.0.0.0"
,
"listen_port"
:
"61009"
,
"socket_type"
:
1
,
"enable_coroutine_runtime"
:
false
,
"server"
:
"LaravelS"
,
"handle_static"
:
false
,
"laravel_base_path"
:
"/home/vagrant/code/ic_server_welfare"
,
"inotify_reload"
:{
"enable"
:
false
,
"watch_path"
:
"/home/vagrant/code/ic_server_welfare"
,
"file_types"
:[
".php"
],
"excluded_dirs"
:[],
"log"
:
true
},
"event_handlers"
:[],
"websocket"
:{
"enable"
:
false
},
"sockets"
:[],
"processes"
:[],
"timer"
:{
"enable"
:
false
,
"jobs"
:[],
"max_wait_time"
:
5
},
"events"
:[],
"swoole_tables"
:[],
"register_providers"
:[],
"cleaners"
:[],
"destroy_controllers"
:{
"enable"
:
false
,
"excluded_list"
:[]},
"swoole"
:{
"daemonize"
:
true
,
"dispatch_mode"
:
2
,
"reactor_num"
:
2
,
"worker_num"
:
2
,
"task_ipc_mode"
:
1
,
"task_max_request"
:
8000
,
"task_tmpdir"
:
"/dev/shm"
,
"max_request"
:
8000
,
"open_tcp_nodelay"
:
true
,
"pid_file"
:
"/home/vagrant/code/ic_server_welfare/storage/laravels.pid"
,
"log_file"
:
"/home/vagrant/code/ic_server_welfare/storage/logs/swoole-2019-08.log"
,
"log_level"
:
4
,
"document_root"
:
"/home/vagrant/code/ic_server_welfare/public"
,
"buffer_output_size"
:
2097152
,
"socket_buffer_size"
:
134217728
,
"package_max_length"
:
4194304
,
"reload_async"
:
true
,
"max_wait_time"
:
60
,
"enable_reuse_port"
:
true
,
"enable_coroutine"
:
false
,
"http_compression"
:
false
},
"enable_gzip"
:
false
,
"process_prefix"
:
"/home/vagrant/code/ic_server_welfare"
,
"ignore_check_pid"
:
false
},
"laravel"
:{
"root_path"
:
"/home/vagrant/code/ic_server_welfare"
,
"static_path"
:
"/home/vagrant/code/ic_server_welfare/public"
,
"cleaners"
:[],
"register_providers"
:[],
"destroy_controllers"
:{
"enable"
:
false
,
"excluded_list"
:[]},
"is_lumen"
:
true
,
"_SERVER"
:{
"LESSOPEN"
:
"| /usr/bin/lesspipe %s"
,
"MAIL"
:
"/var/mail/vagrant"
,
"USER"
:
"vagrant"
,
"SSH_CLIENT"
:
"10.0.2.2 58910 22"
,
"LANGUAGE"
:
"en_US:"
,
"SHLVL"
:
"1"
,
"HOME"
:
"/home/vagrant"
,
"OLDPWD"
:
"/home/vagrant"
,
"SSH_TTY"
:
"/dev/pts/0"
,
"LOGNAME"
:
"vagrant"
,
"_"
:
"/usr/bin/php"
,
"XDG_SESSION_ID"
:
"245"
,
"TERM"
:
"cygwin"
,
"RBENV_SHELL"
:
"bash"
,
"PATH"
:
"/home/vagrant/.composer/vendor/bin:/usr/local/go/bin:/home/vagrant/.rbenv/plugins/ruby-build/bin:/home/vagrant/.rbenv/shims:/home/vagrant/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/vagrant/.dotnet/tools"
,
"S_COLORS"
:
"auto"
,
"XDG_RUNTIME_DIR"
:
"/run/user/1000"
,
"LANG"
:
"en_US.UTF-8"
,
"LS_COLORS"
:
"rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:"
,
"SHELL"
:
"/bin/bash"
,
"LESSCLOSE"
:
"/usr/bin/lesspipe %s %s"
,
"LC_ALL"
:
"en_US.UTF-8"
,
"PWD"
:
"/home/vagrant/code/ic_server_welfare"
,
"SSH_CONNECTION"
:
"10.0.2.2 58910 10.0.2.15 22"
,
"XDG_DATA_DIRS"
:
"/usr/local/share:/usr/share:/var/lib/snapd/desktop"
,
"PHP_SELF"
:
"/home/vagrant/code/ic_server_welfare/artisan"
,
"SCRIPT_NAME"
:
"/home/vagrant/code/ic_server_welfare/artisan"
,
"SCRIPT_FILENAME"
:
"/home/vagrant/code/ic_server_welfare/artisan"
,
"PATH_TRANSLATED"
:
"/home/vagrant/code/ic_server_welfare/artisan"
,
"DOCUMENT_ROOT"
:
""
,
"REQUEST_TIME_FLOAT"
:
1566386749.148036
,
"REQUEST_TIME"
:
1566386749
,
"argv"
:[
"/home/vagrant/code/ic_server_welfare/artisan"
,
"laravels"
,
"config"
,
"--daemonize"
],
"argc"
:
4
,
"APP_ENV"
:
"local"
,
"APP_DEBUG"
:
"true"
,
"APP_KEY"
:
"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt"
,
"APP_TIMEZONE"
:
"PRC"
,
"DB_CONNECTION"
:
"mysql"
,
"DB_HOST"
:
"192.168.2.232"
,
"DB_PORT"
:
"3306"
,
"DB_DATABASE"
:
"ic_welfare"
,
"DB_USERNAME"
:
"ic_welfare"
,
"DB_PASSWORD"
:
"ic_welfare#zsyM"
,
"DB_PREFIX"
:
"ic_"
,
"CACHE_DRIVER"
:
"file"
,
"QUEUE_DRIVER"
:
"sync"
,
"SYSTEM_CODE"
:
"09"
,
"SYSTEM_NAME"
:
"IC业务助手福利中心服务"
,
"LARAVELS_LISTEN_IP"
:
"0.0.0.0"
,
"LARAVELS_LISTEN_PORT"
:
"61009"
,
"SHELL_VERBOSITY"
:
0
},
"_ENV"
:{
"APP_ENV"
:
"local"
,
"APP_DEBUG"
:
"true"
,
"APP_KEY"
:
"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt"
,
"APP_TIMEZONE"
:
"PRC"
,
"DB_CONNECTION"
:
"mysql"
,
"DB_HOST"
:
"192.168.2.232"
,
"DB_PORT"
:
"3306"
,
"DB_DATABASE"
:
"ic_welfare"
,
"DB_USERNAME"
:
"ic_welfare"
,
"DB_PASSWORD"
:
"ic_welfare#zsyM"
,
"DB_PREFIX"
:
"ic_"
,
"CACHE_DRIVER"
:
"file"
,
"QUEUE_DRIVER"
:
"sync"
,
"SYSTEM_CODE"
:
"09"
,
"SYSTEM_NAME"
:
"IC业务助手福利中心服务"
,
"LARAVELS_LISTEN_IP"
:
"0.0.0.0"
,
"LARAVELS_LISTEN_PORT"
:
"61009"
,
"SHELL_VERBOSITY"
:
0
}}}
\ No newline at end of file
{
"server"
:{
"listen_ip"
:
"0.0.0.0"
,
"listen_port"
:
"61009"
,
"socket_type"
:
1
,
"enable_coroutine_runtime"
:
false
,
"server"
:
"LaravelS"
,
"handle_static"
:
false
,
"laravel_base_path"
:
"/home/vagrant/code/ic_server_welfare"
,
"inotify_reload"
:{
"enable"
:
false
,
"watch_path"
:
"/home/vagrant/code/ic_server_welfare"
,
"file_types"
:[
".php"
],
"excluded_dirs"
:[],
"log"
:
true
},
"event_handlers"
:[],
"websocket"
:{
"enable"
:
false
},
"sockets"
:[],
"processes"
:[],
"timer"
:{
"enable"
:
false
,
"jobs"
:[],
"max_wait_time"
:
5
},
"events"
:[],
"swoole_tables"
:[],
"register_providers"
:[],
"cleaners"
:[],
"destroy_controllers"
:{
"enable"
:
false
,
"excluded_list"
:[]},
"swoole"
:{
"daemonize"
:
true
,
"dispatch_mode"
:
2
,
"reactor_num"
:
2
,
"worker_num"
:
2
,
"task_ipc_mode"
:
1
,
"task_max_request"
:
8000
,
"task_tmpdir"
:
"/dev/shm"
,
"max_request"
:
8000
,
"open_tcp_nodelay"
:
true
,
"pid_file"
:
"/home/vagrant/code/ic_server_welfare/storage/laravels.pid"
,
"log_file"
:
"/home/vagrant/code/ic_server_welfare/storage/logs/swoole-2019-08.log"
,
"log_level"
:
4
,
"document_root"
:
"/home/vagrant/code/ic_server_welfare/public"
,
"buffer_output_size"
:
2097152
,
"socket_buffer_size"
:
134217728
,
"package_max_length"
:
4194304
,
"reload_async"
:
true
,
"max_wait_time"
:
60
,
"enable_reuse_port"
:
true
,
"enable_coroutine"
:
false
,
"http_compression"
:
false
},
"enable_gzip"
:
false
,
"process_prefix"
:
"/home/vagrant/code/ic_server_welfare"
,
"ignore_check_pid"
:
false
},
"laravel"
:{
"root_path"
:
"/home/vagrant/code/ic_server_welfare"
,
"static_path"
:
"/home/vagrant/code/ic_server_welfare/public"
,
"cleaners"
:[],
"register_providers"
:[],
"destroy_controllers"
:{
"enable"
:
false
,
"excluded_list"
:[]},
"is_lumen"
:
true
,
"_SERVER"
:{
"LESSOPEN"
:
"| /usr/bin/lesspipe %s"
,
"MAIL"
:
"/var/mail/vagrant"
,
"USER"
:
"vagrant"
,
"SSH_CLIENT"
:
"10.0.2.2 58910 22"
,
"LANGUAGE"
:
"en_US:"
,
"SHLVL"
:
"1"
,
"HOME"
:
"/home/vagrant"
,
"OLDPWD"
:
"/home/vagrant"
,
"SSH_TTY"
:
"/dev/pts/0"
,
"LOGNAME"
:
"vagrant"
,
"_"
:
"/usr/bin/php"
,
"XDG_SESSION_ID"
:
"245"
,
"TERM"
:
"cygwin"
,
"RBENV_SHELL"
:
"bash"
,
"PATH"
:
"/home/vagrant/.composer/vendor/bin:/usr/local/go/bin:/home/vagrant/.rbenv/plugins/ruby-build/bin:/home/vagrant/.rbenv/shims:/home/vagrant/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/vagrant/.dotnet/tools"
,
"S_COLORS"
:
"auto"
,
"XDG_RUNTIME_DIR"
:
"/run/user/1000"
,
"LANG"
:
"en_US.UTF-8"
,
"LS_COLORS"
:
"rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:"
,
"SHELL"
:
"/bin/bash"
,
"LESSCLOSE"
:
"/usr/bin/lesspipe %s %s"
,
"LC_ALL"
:
"en_US.UTF-8"
,
"PWD"
:
"/home/vagrant/code/ic_server_welfare"
,
"SSH_CONNECTION"
:
"10.0.2.2 58910 10.0.2.15 22"
,
"XDG_DATA_DIRS"
:
"/usr/local/share:/usr/share:/var/lib/snapd/desktop"
,
"PHP_SELF"
:
"/home/vagrant/code/ic_server_welfare/artisan"
,
"SCRIPT_NAME"
:
"/home/vagrant/code/ic_server_welfare/artisan"
,
"SCRIPT_FILENAME"
:
"/home/vagrant/code/ic_server_welfare/artisan"
,
"PATH_TRANSLATED"
:
"/home/vagrant/code/ic_server_welfare/artisan"
,
"DOCUMENT_ROOT"
:
""
,
"REQUEST_TIME_FLOAT"
:
1566389229.529798
,
"REQUEST_TIME"
:
1566389229
,
"argv"
:[
"/home/vagrant/code/ic_server_welfare/artisan"
,
"laravels"
,
"config"
,
"--daemonize"
],
"argc"
:
4
,
"APP_ENV"
:
"local"
,
"APP_DEBUG"
:
"true"
,
"APP_KEY"
:
"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt"
,
"APP_TIMEZONE"
:
"PRC"
,
"DB_CONNECTION"
:
"mysql"
,
"DB_HOST"
:
"192.168.2.232"
,
"DB_PORT"
:
"3306"
,
"DB_DATABASE"
:
"ic_welfare"
,
"DB_USERNAME"
:
"ic_welfare"
,
"DB_PASSWORD"
:
"ic_welfare#zsyM"
,
"DB_PREFIX"
:
"ic_"
,
"CACHE_DRIVER"
:
"file"
,
"QUEUE_DRIVER"
:
"sync"
,
"SYSTEM_CODE"
:
"09"
,
"SYSTEM_NAME"
:
"IC业务助手福利中心服务"
,
"LARAVELS_LISTEN_IP"
:
"0.0.0.0"
,
"LARAVELS_LISTEN_PORT"
:
"61009"
,
"SHELL_VERBOSITY"
:
0
},
"_ENV"
:{
"APP_ENV"
:
"local"
,
"APP_DEBUG"
:
"true"
,
"APP_KEY"
:
"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt"
,
"APP_TIMEZONE"
:
"PRC"
,
"DB_CONNECTION"
:
"mysql"
,
"DB_HOST"
:
"192.168.2.232"
,
"DB_PORT"
:
"3306"
,
"DB_DATABASE"
:
"ic_welfare"
,
"DB_USERNAME"
:
"ic_welfare"
,
"DB_PASSWORD"
:
"ic_welfare#zsyM"
,
"DB_PREFIX"
:
"ic_"
,
"CACHE_DRIVER"
:
"file"
,
"QUEUE_DRIVER"
:
"sync"
,
"SYSTEM_CODE"
:
"09"
,
"SYSTEM_NAME"
:
"IC业务助手福利中心服务"
,
"LARAVELS_LISTEN_IP"
:
"0.0.0.0"
,
"LARAVELS_LISTEN_PORT"
:
"61009"
,
"SHELL_VERBOSITY"
:
0
}}}
\ No newline at end of file
storage/laravels.pid
View file @
48660cee
17991
\ No newline at end of file
18264
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment