记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
960cfb25
Commit
960cfb25
authored
Feb 22, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改正在下单 出货详情
parent
228d56c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
GoblinAppZhengzaiController.java
...ervice/goblin/controller/GoblinAppZhengzaiController.java
+5
-5
GoblinAppZhengzaiServiceImpl.java
...ice/goblin/service/impl/GoblinAppZhengzaiServiceImpl.java
+1
-0
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinAppZhengzaiController.java
View file @
960cfb25
...
...
@@ -100,8 +100,8 @@ public class GoblinAppZhengzaiController {
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"marketId"
,
value
=
"活动id"
,
example
=
"1"
),
})
public
ResponseDto
<
Boolean
>
orderPush
(
@RequestParam
(
"offCode"
)
@Valid
String
offCode
,
@RequestParam
(
"marketId"
)
@Valid
String
marketId
)
{
return
goblinAppZhengzaiService
.
orderPush
(
offCode
,
marketId
);
@RequestParam
(
"marketId"
)
@Valid
String
marketId
)
{
return
goblinAppZhengzaiService
.
orderPush
(
offCode
,
marketId
);
}
@PostMapping
(
"orderPushDetails"
)
...
...
@@ -113,7 +113,7 @@ public class GoblinAppZhengzaiController {
})
public
ResponseDto
<
List
<
GoblinZhengzaiPushVo
>>
orderPushDetails
(
@RequestParam
(
"offCode"
)
@Valid
String
offCode
,
@RequestParam
(
"marketId"
)
@Valid
String
marketId
)
{
return
goblinAppZhengzaiService
.
orderPushDetails
(
offCode
,
marketId
);
return
goblinAppZhengzaiService
.
orderPushDetails
(
offCode
,
"ZZ"
+
marketId
);
}
@PostMapping
(
"orderBind"
)
...
...
@@ -136,7 +136,7 @@ public class GoblinAppZhengzaiController {
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"mailId"
,
value
=
"mailId"
,
example
=
"1"
),
})
public
ResponseDto
<
List
<
GoblinMailVo
>>
getMail
(
@RequestParam
(
"orderId"
)
@Valid
String
orderId
,
@RequestParam
(
"mailId"
)
@Valid
String
mailId
)
{
return
goblinOrderService
.
getMail
(
orderId
,
mailId
);
@RequestParam
(
"mailId"
)
@Valid
String
mailId
)
{
return
goblinOrderService
.
getMail
(
orderId
,
mailId
);
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinAppZhengzaiServiceImpl.java
View file @
960cfb25
...
...
@@ -173,6 +173,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
vo
.
setSkuSpecs
(
skuInfoVo
.
getSkuSpecs
());
vo
.
setSpuName
(
skuInfoVo
.
getSpuName
());
vo
.
setStatus
(
skuInfoVo
.
getStatus
());
listVo
.
add
(
vo
);
}
}
}
...
...
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