Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
shop
Project
Project
Details
Activity
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
曲欣亮
shop
Commits
423c6849
Commit
423c6849
authored
Sep 18, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
fc8ecdae
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
BrandController.java
src/main/java/com/egolm/shop/controller/BrandController.java
+4
-4
BrandServiceImpl.java
...in/java/com/egolm/shop/service/impl/BrandServiceImpl.java
+2
-2
No files found.
src/main/java/com/egolm/shop/controller/BrandController.java
View file @
423c6849
...
@@ -125,8 +125,8 @@ public class BrandController {
...
@@ -125,8 +125,8 @@ public class BrandController {
@ApiOperation
(
"热销品牌列表"
)
@ApiOperation
(
"热销品牌列表"
)
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
paramType
=
"query"
,
name
=
"orgN
O
"
,
dataType
=
"String"
,
required
=
true
,
value
=
"区域编号"
,
defaultValue
=
""
),
@ApiImplicitParam
(
paramType
=
"query"
,
name
=
"orgN
o
"
,
dataType
=
"String"
,
required
=
true
,
value
=
"区域编号"
,
defaultValue
=
""
),
@ApiImplicitParam
(
paramType
=
"query"
,
name
=
"compN
O
"
,
dataType
=
"String"
,
required
=
true
,
value
=
"组件编号"
,
defaultValue
=
""
),
@ApiImplicitParam
(
paramType
=
"query"
,
name
=
"compN
o
"
,
dataType
=
"String"
,
required
=
true
,
value
=
"组件编号"
,
defaultValue
=
""
),
@ApiImplicitParam
(
paramType
=
"query"
,
name
=
"index"
,
dataType
=
"String"
,
required
=
false
,
value
=
"第几页"
,
defaultValue
=
"1"
),
@ApiImplicitParam
(
paramType
=
"query"
,
name
=
"index"
,
dataType
=
"String"
,
required
=
false
,
value
=
"第几页"
,
defaultValue
=
"1"
),
@ApiImplicitParam
(
paramType
=
"query"
,
name
=
"limit"
,
dataType
=
"String"
,
required
=
false
,
value
=
"每页数量"
,
defaultValue
=
"20"
),
@ApiImplicitParam
(
paramType
=
"query"
,
name
=
"limit"
,
dataType
=
"String"
,
required
=
false
,
value
=
"每页数量"
,
defaultValue
=
"20"
),
...
@@ -139,8 +139,8 @@ public class BrandController {
...
@@ -139,8 +139,8 @@ public class BrandController {
public
String
getHotSaleBrands
(
HttpServletRequest
request
,
HttpServletResponse
response
)
{
public
String
getHotSaleBrands
(
HttpServletRequest
request
,
HttpServletResponse
response
)
{
List
<
Map
<
String
,
Object
>>
listMap
;
List
<
Map
<
String
,
Object
>>
listMap
;
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"orgN
O"
,
request
.
getParameter
(
"orgNO
"
));
params
.
put
(
"orgN
o"
,
request
.
getParameter
(
"orgNo
"
));
params
.
put
(
"compN
O"
,
request
.
getParameter
(
"compNO
"
));
params
.
put
(
"compN
o"
,
request
.
getParameter
(
"compNo
"
));
Page
page
=
new
Page
();
Page
page
=
new
Page
();
page
.
setIndex
(
Long
.
valueOf
(
request
.
getParameter
(
"index"
)==
null
?
"1"
:
request
.
getParameter
(
"index"
)));
page
.
setIndex
(
Long
.
valueOf
(
request
.
getParameter
(
"index"
)==
null
?
"1"
:
request
.
getParameter
(
"index"
)));
page
.
setLimit
(
Long
.
valueOf
(
request
.
getParameter
(
"limit"
)==
null
?
"20"
:
request
.
getParameter
(
"limit"
)));
page
.
setLimit
(
Long
.
valueOf
(
request
.
getParameter
(
"limit"
)==
null
?
"20"
:
request
.
getParameter
(
"limit"
)));
...
...
src/main/java/com/egolm/shop/service/impl/BrandServiceImpl.java
View file @
423c6849
...
@@ -84,8 +84,8 @@ public class BrandServiceImpl implements BrandService {
...
@@ -84,8 +84,8 @@ public class BrandServiceImpl implements BrandService {
+
"b.sBrandID, "
+
"b.sBrandID, "
+
"b.sBrandName, "
+
"b.sBrandName, "
+
"b.sLogoUrl "
;
+
"b.sLogoUrl "
;
String
orgN
O
=(
String
)
map
.
get
(
"orgNO
"
);
String
orgN
o
=(
String
)
map
.
get
(
"orgNo
"
);
jdbcTemplate
.
setDialect
(
new
SqlServerDialect
());
jdbcTemplate
.
setDialect
(
new
SqlServerDialect
());
return
jdbcTemplate
.
limit
(
sql
,
page
,
orgN
O
);
return
jdbcTemplate
.
limit
(
sql
,
page
,
orgN
o
);
}
}
}
}
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