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
0871a41f
Commit
0871a41f
authored
Aug 29, 2018
by
黄毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
9e13d548
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
BrandController.java
src/main/java/com/egolm/shop/controller/BrandController.java
+2
-3
GoodsController.java
src/main/java/com/egolm/shop/controller/GoodsController.java
+2
-2
GoodsServiceImpl.java
...in/java/com/egolm/shop/service/impl/GoodsServiceImpl.java
+2
-0
No files found.
src/main/java/com/egolm/shop/controller/BrandController.java
View file @
0871a41f
...
...
@@ -60,11 +60,10 @@ public class BrandController {
Page
page
=
new
Page
();
page
.
setIndex
(
Long
.
valueOf
(
index
));
page
.
setLimit
(
Long
.
valueOf
(
limit
));
page
.
setLimitKey
(
"BannerID
de
sc"
);
page
.
setLimitKey
(
"BannerID
a
sc"
);
List
<
Map
<
String
,
Object
>>
detailList
=
brandService
.
listBanner
(
param
,
page
);
// return Rjx.jsonOk().set("list", detailList).setPage(page).toString();
return
Rjx
.
jsonOk
().
set
(
"list"
,
detailList
).
toString
();
return
Rjx
.
jsonOk
().
set
(
"list"
,
detailList
).
setPage
(
page
).
toString
();
}
@ApiOperation
(
"品牌列表接口按首字母"
)
...
...
src/main/java/com/egolm/shop/controller/GoodsController.java
View file @
0871a41f
...
...
@@ -52,8 +52,8 @@ public class GoodsController {
userNO
=
"nouserNO"
;
}
String
langId
=
request
.
getParameter
(
"LangID"
);
String
index
=
"
20
"
;
String
limit
=
"
1
"
;
String
index
=
"
1
"
;
String
limit
=
"
20
"
;
if
(!
StringUtil
.
isNotEmpty
(
orgNO
,
compNO
,
limit
,
index
))
{
return
Rjx
.
json
().
setCode
(-
1
).
setMessage
(
"参数缺失"
).
toJson
();
...
...
src/main/java/com/egolm/shop/service/impl/GoodsServiceImpl.java
View file @
0871a41f
...
...
@@ -15,6 +15,7 @@ import com.egolm.common.DateUtil;
import
com.egolm.common.StringUtil
;
import
com.egolm.common.jdbc.JdbcTemplate
;
import
com.egolm.common.jdbc.Page
;
import
com.egolm.common.jdbc.dialect.SqlServerDialect
;
import
com.egolm.shop.service.GoodsService
;
@Service
public
class
GoodsServiceImpl
implements
GoodsService
{
...
...
@@ -45,6 +46,7 @@ public class GoodsServiceImpl implements GoodsService {
sql
+=
" where acg.sOrgNO = '"
+
orgNO
+
"' and a.dTradeDate >= '"
+
beginDate
+
"' and a.dTradeDate < '"
+
endDate
+
"'"
;
}
sql
+=
" group by a.nGoodsID, g.sGoodsNO, g.sGoodsDesc, acg.nSalePrice, acg.sSpec, acg.sUnit, acg.nMinSaleQty, acg.nSaleUnits, acg.nMarketPrice, acg.sMarketUnit"
;
jdbcTemplate
.
setDialect
(
new
SqlServerDialect
());
return
jdbcTemplate
.
limit
(
sql
,
page
);
}
...
...
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