Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
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
周健威
rs-cloud-platform
Commits
0475e756
Commit
0475e756
authored
Dec 04, 2020
by
unset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善接口信息
parent
586e3da3
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
7 deletions
+13
-7
ImageInformationDto.java
...m/upyuns/platform/rs/website/dto/ImageInformationDto.java
+2
-0
ImageInformation.java
...m/upyuns/platform/rs/website/entity/ImageInformation.java
+2
-0
ImageInformationBiz.java
...m/upyuns/platform/rs/website/biz/ImageInformationBiz.java
+3
-0
NewsInfoBiz.java
.../java/com/upyuns/platform/rs/website/biz/NewsInfoBiz.java
+1
-1
NewsTypeBiz.java
.../java/com/upyuns/platform/rs/website/biz/NewsTypeBiz.java
+3
-3
ShoppingCartInfoBiz.java
...m/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java
+0
-1
NewsTypeController.java
...ns/platform/rs/website/controller/NewsTypeController.java
+2
-2
No files found.
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ImageInformationDto.java
View file @
0475e756
...
...
@@ -15,4 +15,6 @@ public class ImageInformationDto extends PageParam {
String
name
;
Integer
status
;
Integer
indexShow
;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ImageInformation.java
View file @
0475e756
...
...
@@ -95,4 +95,6 @@ public class ImageInformation implements Serializable {
private
Date
updTime
;
private
Integer
indexShow
;
}
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageInformationBiz.java
View file @
0475e756
...
...
@@ -67,6 +67,9 @@ public class ImageInformationBiz extends BaseBiz<ImageInformationMapper, ImageIn
if
(
imageInformationDto
.
getStatus
()
!=
null
)
{
criteria
.
andEqualTo
(
"status"
,
imageInformationDto
.
getStatus
());
}
if
(
imageInformationDto
.
getIndexShow
()
!=
null
)
{
criteria
.
andEqualTo
(
"indexShow"
,
imageInformationDto
.
getIndexShow
());
}
example
.
orderBy
(
"updTime"
).
desc
();
Query
query
=
new
Query
(
imageInformationDto
);
PageDataVO
<
ImageInformation
>
pageDataVO
=
PageDataVO
.
pageInfo
(
query
,
()
->
mapper
.
selectByExample
(
example
));
...
...
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/NewsInfoBiz.java
View file @
0475e756
...
...
@@ -86,7 +86,7 @@ public class NewsInfoBiz extends BaseBiz<NewsInfoMapper, NewsInfo> {
Map
<
Integer
,
List
<
NewsInfo
>>
listMap
=
list
.
stream
()
.
collect
(
Collectors
.
groupingBy
(
NewsInfo:
:
getTypeId
));
if
(
MapUtil
.
isNotEmpty
(
listMap
))
{
List
<
NewsType
>
newsTypeList
=
newsTypeBiz
.
getAll
(
1
).
getData
();
List
<
NewsType
>
newsTypeList
=
newsTypeBiz
.
getAll
().
getData
();
if
(
newsTypeList
!=
null
&&
newsTypeList
.
size
()
>
0
)
{
Map
<
Integer
,
List
<
NewsType
>>
map
=
newsTypeList
.
stream
().
collect
(
Collectors
.
groupingBy
(
NewsType:
:
getId
));
for
(
Map
.
Entry
<
Integer
,
List
<
NewsInfo
>>
entry
:
listMap
.
entrySet
())
{
...
...
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/NewsTypeBiz.java
View file @
0475e756
...
...
@@ -59,12 +59,12 @@ public class NewsTypeBiz extends BaseBiz<NewsTypeMapper, NewsType> {
/**
* 查询所有首页展示
* @param indexShow 是否首页展示
* @return
*/
public
ObjectRestResponse
<
List
<
NewsType
>>
getAll
(
Integer
indexShow
)
{
public
ObjectRestResponse
<
List
<
NewsType
>>
getAll
()
{
Example
example
=
new
Example
(
NewsType
.
class
);
example
.
createCriteria
().
andEqualTo
(
"isDel"
,
0
).
andEqualTo
(
"status"
,
1
);
Example
.
Criteria
criteria
=
example
.
createCriteria
();
criteria
.
andEqualTo
(
"isDel"
,
0
).
andEqualTo
(
"status"
,
1
);
example
.
orderBy
(
"rank"
);
return
ObjectRestResponse
.
succ
(
mapper
.
selectByExample
(
example
));
}
...
...
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java
View file @
0475e756
...
...
@@ -105,7 +105,6 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper,Shopping
OrderInfo
orderInfo
=
new
OrderInfo
();
orderInfo
.
setAmount
(
new
BigDecimal
(
amount
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
orderInfo
.
setNumber
(
totalNumber
);
orderInfo
.
set
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/NewsTypeController.java
View file @
0475e756
...
...
@@ -17,8 +17,8 @@ public class NewsTypeController extends BaseController<NewsTypeBiz, NewsType> {
}
@GetMapping
(
value
=
"/app/unauth/getAll"
)
public
ObjectRestResponse
getAll
(
Integer
indexShow
)
{
return
baseBiz
.
getAll
(
indexShow
);
public
ObjectRestResponse
getAll
()
{
return
baseBiz
.
getAll
();
}
@GetMapping
(
value
=
"getList"
)
...
...
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