Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
ic_welfare_api
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
ccd55a8b
authored
Aug 29, 2019
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
添加已使用次数给红包活动列表
parent
58a6eccc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
app/Http/Controllers/IntegralsController.php
app/Services/IntegralService.php
app/Http/Controllers/IntegralsController.php
View file @
ccd55a8b
...
...
@@ -34,18 +34,13 @@ class IntegralsController extends Controller
public
function
index
(
Request
$request
,
UserIntegralService
$userIntegralService
)
{
$userId
=
$request
->
user
->
user_id
;
$map
=
[
'is_api'
=>
1
];
$map
=
[
'is_api'
=>
1
,
'user_id'
=>
$userId
];
$result
=
$this
->
service
->
getIntegralList
(
$map
);
//获取用户当前红包数额
$userIntegral
=
$userIntegralService
->
getUserIntegral
([
'id'
=>
$userId
]);
if
(
$userIntegral
)
{
$result
[
'integral'
]
=
$userIntegral
[
'data'
][
'integral'
];
}
//获得当前是否已经签到
$checkInStatus
=
$this
->
service
->
getCheckInStatus
(
$userId
);
$result
[
'check_in_status'
]
=
$checkInStatus
;
return
$this
->
Export
(
0
,
'ok'
,
$result
);
}
...
...
app/Services/IntegralService.php
View file @
ccd55a8b
...
...
@@ -3,6 +3,8 @@
namespace
App\Services
;
use
Common\Model\RedisModel
;
class
IntegralService
{
public
function
getIntegralList
(
$map
=
[])
...
...
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