Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
26f1d32e
Commit
26f1d32e
authored
Feb 04, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
b8debc32
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
14 deletions
+11
-14
RB_Member_PointBalanceRepository.cs
Mall.Repository/Point/RB_Member_PointBalanceRepository.cs
+9
-7
PointController.cs
Mall.WebApi/Controllers/Education/PointController.cs
+2
-7
No files found.
Mall.Repository/Point/RB_Member_PointBalanceRepository.cs
View file @
26f1d32e
...
...
@@ -55,29 +55,31 @@ namespace Mall.Repository.Point
public
List
<
RB_Member_PointBalance_Extend
>
GetPointBalancePageList
(
int
pageIndex
,
int
pageSize
,
out
long
rowsCount
,
RB_Member_PointBalance_Extend
where
)
{
StringBuilder
sb
=
new
StringBuilder
();
sb
.
Append
(
$@"SELECT * from RB_Member_PointBalance where 1=1 "
);
sb
.
Append
(
$@"SELECT b.*,u.Name as UserName,u.Photo as UserPhoto from RB_Member_PointBalance b
left join rb_member_user u on b.UserId = u.Id
where 1=1 "
);
if
(
where
!=
null
)
{
if
(
where
.
TenantId
>
0
)
{
sb
.
AppendFormat
(
" and TenantId={0}"
,
where
.
TenantId
);
sb
.
AppendFormat
(
" and
b.
TenantId={0}"
,
where
.
TenantId
);
}
if
(
where
.
MallBaseId
>
0
)
{
sb
.
AppendFormat
(
" and MallBaseId={0}"
,
where
.
MallBaseId
);
sb
.
AppendFormat
(
" and
b.
MallBaseId={0}"
,
where
.
MallBaseId
);
}
if
(
where
.
UserId
>
0
)
{
sb
.
AppendFormat
(
" and UserId={0}"
,
where
.
UserId
);
sb
.
AppendFormat
(
" and
b.
UserId={0}"
,
where
.
UserId
);
}
if
(
where
.
Type
>
0
)
{
sb
.
AppendFormat
(
" and Type ={0}"
,
(
int
)
where
.
Type
);
sb
.
AppendFormat
(
" and
b.
Type ={0}"
,
(
int
)
where
.
Type
);
}
if
(
where
.
OrderId
>
0
)
{
sb
.
AppendFormat
(
" and OrderId ={0}"
,
where
.
OrderId
);
sb
.
AppendFormat
(
" and
b.
OrderId ={0}"
,
where
.
OrderId
);
}
}
sb
.
Append
(
$@" order by Id desc"
);
sb
.
Append
(
$@" order by
b.
Id desc"
);
return
GetPage
<
RB_Member_PointBalance_Extend
>(
pageIndex
,
pageSize
,
out
rowsCount
,
sb
.
ToString
()).
ToList
();
}
}
...
...
Mall.WebApi/Controllers/Education/PointController.cs
View file @
26f1d32e
...
...
@@ -168,12 +168,6 @@ namespace Mall.WebApi.Controllers.Education
demodel
.
MallBaseId
=
userInfo
.
MallBaseId
;
var
list
=
pointModule
.
GetUserPointDetailPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
list
.
ForEach
(
x
=>
{
var
umodel
=
UserReidsCache
.
GetAppletUserLoginInfo
(
x
.
UserId
);
x
.
UserName
=
umodel
?.
Name
??
""
;
x
.
UserPhoto
=
umodel
?.
Photo
??
""
;
});
pagelist
.
pageData
=
list
.
Select
(
x
=>
new
{
x
.
Id
,
...
...
@@ -185,7 +179,8 @@ namespace Mall.WebApi.Controllers.Education
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
x
.
UserId
,
x
.
UserName
,
x
.
UserPhoto
x
.
UserPhoto
,
x
.
OrderId
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
...
...
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