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
83c70005
Commit
83c70005
authored
Nov 09, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
251c1fed
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
RB_Member_Footmark_Extend.cs
Mall.Model/Extend/User/RB_Member_Footmark_Extend.cs
+1
-1
RB_Member_FootmarkRepository.cs
Mall.Repository/User/RB_Member_FootmarkRepository.cs
+3
-1
AppletUserController.cs
Mall.WebApi/Controllers/User/AppletUserController.cs
+2
-1
No files found.
Mall.Model/Extend/User/RB_Member_Footmark_Extend.cs
View file @
83c70005
...
...
@@ -34,7 +34,7 @@ namespace Mall.Model.Extend.User
/// </summary>
public
decimal
Price
{
get
;
set
;
}
/// <summary>
/// 商品分类
0正常商品 1司导商
品
/// 商品分类
0正常商品 1司导商品 2教育商品,3-线下服务产
品
/// </summary>
public
int
GoodsClassify
{
get
;
set
;
}
}
...
...
Mall.Repository/User/RB_Member_FootmarkRepository.cs
View file @
83c70005
...
...
@@ -44,7 +44,9 @@ namespace Mall.Repository.User
where
+=
$@" and f.
{
nameof
(
RB_Member_Footmark
.
CreateDate
)}
<='
{
dmodel
.
EndTime
}
23:59:59'"
;
}
string
sql
=
$@"select f.* from RB_Member_Footmark f
string
sql
=
$@"
select f.*,g.GoodsClassify
from RB_Member_Footmark f
inner join rb_goods g on f.GoodsId = g.Id
where
{
where
}
order by f.CreateDate desc"
;
return
GetPage
<
RB_Member_Footmark_Extend
>(
pageIndex
,
pageSize
,
out
rowCount
,
sql
).
ToList
();
...
...
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @
83c70005
...
...
@@ -962,7 +962,8 @@ namespace Mall.WebApi.Controllers.User
x
.
GoodsName
,
x
.
GoodsImgPath
,
x
.
Price
,
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd"
)
:
""
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd"
)
:
""
,
x
.
GoodsClassify
,
});
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