Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴学德
gdtel-gztel-school-center
Commits
37b48f08
Commit
37b48f08
authored
Apr 03, 2020
by
黄森林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改
parent
ce39a4c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
service-manager/src/main/java/com/winsun/controller/supervisorController.java
+5
-5
No files found.
service-manager/src/main/java/com/winsun/controller/supervisorController.java
View file @
37b48f08
...
@@ -158,9 +158,9 @@ public class supervisorController extends BaseController {
...
@@ -158,9 +158,9 @@ public class supervisorController extends BaseController {
wrapper
.
eq
(
"id"
,
orderId
);
wrapper
.
eq
(
"id"
,
orderId
);
Order
order
=
orderMapper
.
selectById
(
orderId
);
Order
order
=
orderMapper
.
selectById
(
orderId
);
Map
<
String
,
Object
>
dataMapping
=
new
HashMap
<>();
Map
<
String
,
Object
>
dataMapping
=
new
HashMap
<>();
int
xb
=
order
.
getXbType
();
String
xb
=
order
.
getXbType
();
if
(
"0"
.
equals
(
type
))
{
if
(
"0"
.
equals
(
type
))
{
if
(
xb
==
1
)
{
if
(
"1"
.
equals
(
xb
)
)
{
dataMapping
.
put
(
"order_status"
,
"待配送"
);
dataMapping
.
put
(
"order_status"
,
"待配送"
);
dataMapping
.
put
(
"send_type"
,
"快递"
);
dataMapping
.
put
(
"send_type"
,
"快递"
);
}
else
{
}
else
{
...
@@ -169,7 +169,7 @@ public class supervisorController extends BaseController {
...
@@ -169,7 +169,7 @@ public class supervisorController extends BaseController {
}
}
}
}
if
(
"1"
.
equals
(
type
))
{
if
(
"1"
.
equals
(
type
))
{
if
(
xb
==
1
)
{
if
(
"1"
.
equals
(
xb
)
)
{
dataMapping
.
put
(
"order_status"
,
"待活体"
);
dataMapping
.
put
(
"order_status"
,
"待活体"
);
dataMapping
.
put
(
"send_type"
,
"送货上门"
);
dataMapping
.
put
(
"send_type"
,
"送货上门"
);
}
else
{
}
else
{
...
@@ -272,8 +272,8 @@ public class supervisorController extends BaseController {
...
@@ -272,8 +272,8 @@ public class supervisorController extends BaseController {
Wrapper
wrapper
=
new
EntityWrapper
<>();
Wrapper
wrapper
=
new
EntityWrapper
<>();
wrapper
.
eq
(
"id"
,
orderId
);
wrapper
.
eq
(
"id"
,
orderId
);
Map
<
String
,
Object
>
dataMapping
=
new
HashMap
<>();
Map
<
String
,
Object
>
dataMapping
=
new
HashMap
<>();
int
xbType
=
order
.
getXbType
();
String
xbType
=
order
.
getXbType
();
if
(
xbType
==
1
)
{
if
(
"1"
.
equals
(
xbType
)
)
{
dataMapping
.
put
(
"order_status"
,
"待活体"
);
dataMapping
.
put
(
"order_status"
,
"待活体"
);
}
else
{
}
else
{
dataMapping
.
put
(
"order_status"
,
"已完成"
);
dataMapping
.
put
(
"order_status"
,
"已完成"
);
...
...
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