Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 4217e49e
authored
Jun 08, 2023
by
王力
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature_mvp616_wangl' into 'develop'
接口请求参数变更 See merge request !31
2 parents
d68a5b6a
ab38b472
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/controller/DispatchController.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/DispatchService.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java
project-order/src/main/java/com/alibaba/cloud/integration/order/controller/DispatchController.java
View file @
4217e49
...
@@ -38,12 +38,12 @@ public class DispatchController {
...
@@ -38,12 +38,12 @@ public class DispatchController {
return
res
;
return
res
;
}
}
@PostMapping
(
"/disp
ta
ch/order/confirm"
)
@PostMapping
(
"/disp
at
ch/order/confirm"
)
public
Result
<?>
dispatchOrderConfirm
(
@RequestBody
String
orderId
,
@RequestBody
String
engineerCode
)
{
public
Result
<?>
dispatchOrderConfirm
(
@RequestBody
String
engineerCode
,
@RequestBody
String
orderIds
)
{
// 派工台确认派单
// 派工台确认派单
Result
<?>
res
=
null
;
Result
<?>
res
=
null
;
try
{
try
{
res
=
dispatchService
.
dispatchOrderConfirm
(
orderId
,
engineerCode
);
res
=
dispatchService
.
dispatchOrderConfirm
(
engineerCode
,
orderIds
);
}
catch
(
BusinessException
e
){
}
catch
(
BusinessException
e
){
Result
.
failed
(
e
.
getMessage
());
Result
.
failed
(
e
.
getMessage
());
}
}
...
...
project-order/src/main/java/com/alibaba/cloud/integration/order/service/DispatchService.java
View file @
4217e49
...
@@ -7,5 +7,5 @@ public interface DispatchService {
...
@@ -7,5 +7,5 @@ public interface DispatchService {
Result
<?>
getDispatchOrderList
(
String
levelType
,
String
levelIds
,
String
date
,
String
groupTagId
);
Result
<?>
getDispatchOrderList
(
String
levelType
,
String
levelIds
,
String
date
,
String
groupTagId
);
Result
<?>
getDispatchEngineerOrderList
(
String
levelType
,
String
levelIds
,
String
date
);
Result
<?>
getDispatchEngineerOrderList
(
String
levelType
,
String
levelIds
,
String
date
);
Result
<?>
dispatchOrderConfirm
(
String
orderId
,
String
engineerCode
);
Result
<?>
dispatchOrderConfirm
(
String
engineerCode
,
String
orderIds
);
}
}
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java
View file @
4217e49
...
@@ -17,7 +17,7 @@ public class DispatchServiceImpl implements DispatchService {
...
@@ -17,7 +17,7 @@ public class DispatchServiceImpl implements DispatchService {
}
}
@Override
@Override
public
Result
<?>
dispatchOrderConfirm
(
String
orderId
,
String
engineerCode
)
{
public
Result
<?>
dispatchOrderConfirm
(
String
engineerCode
,
String
orderIds
)
{
return
null
;
return
null
;
}
}
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment