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
5b6bd600
Commit
5b6bd600
authored
Sep 28, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
59aa7e35
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
0 deletions
+1
-0
PromoController.java
src/main/java/com/egolm/shop/controller/PromoController.java
+1
-0
No files found.
src/main/java/com/egolm/shop/controller/PromoController.java
View file @
5b6bd600
...
...
@@ -74,6 +74,7 @@ public class PromoController {
promoMap
.
put
(
"nTotalRealAmount"
,
nTotalRealAmount
);
promoMap
.
put
(
"nTotalPayAmount"
,
nTotalPayAmount
);
promoMap
.
put
(
"nTotalQty"
,
nTotalQty
);
promoMap
.
put
(
"sPromoGrouoNO"
,
promoGroupNO
);
List
<
Map
<
String
,
Object
>>
DLPicList
=
service
.
getGroupPicList
(
"DL"
,
promoPaperNO
,
promoGroupNO
);
List
<
Map
<
String
,
Object
>>
BNPicList
=
service
.
getGroupPicList
(
"BN"
,
promoPaperNO
,
promoGroupNO
);
return
Rjx
.
jsonOk
().
set
(
"data"
,
promoMap
).
set
(
"list"
,
list
).
set
(
"DLPicList"
,
DLPicList
).
set
(
"BNPicList"
,
BNPicList
).
toJson
();
...
...
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