Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wwwanlingxiao
mall
Commits
168dc0b1
Commit
168dc0b1
authored
Oct 25, 2018
by
zhh
Browse files
bug修复
parent
7054e92c
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
document/sql/mall.sql
View file @
168dc0b1
This diff is collapsed.
Click to expand it.
mall-admin/src/main/java/com/macro/mall/service/impl/OmsOrderReturnApplyServiceImpl.java
View file @
168dc0b1
...
@@ -44,7 +44,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
...
@@ -44,7 +44,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
OmsOrderReturnApply
returnApply
=
new
OmsOrderReturnApply
();
OmsOrderReturnApply
returnApply
=
new
OmsOrderReturnApply
();
if
(
status
.
equals
(
1
)){
if
(
status
.
equals
(
1
)){
//确认退货
//确认退货
returnApply
.
setId
(
statusParam
.
getId
()
);
returnApply
.
setId
(
id
);
returnApply
.
setStatus
(
1
);
returnApply
.
setStatus
(
1
);
returnApply
.
setReturnAmount
(
statusParam
.
getReturnAmount
());
returnApply
.
setReturnAmount
(
statusParam
.
getReturnAmount
());
returnApply
.
setCompanyAddressId
(
statusParam
.
getCompanyAddressId
());
returnApply
.
setCompanyAddressId
(
statusParam
.
getCompanyAddressId
());
...
@@ -53,14 +53,14 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
...
@@ -53,14 +53,14 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
returnApply
.
setHandleNote
(
statusParam
.
getHandleNote
());
returnApply
.
setHandleNote
(
statusParam
.
getHandleNote
());
}
else
if
(
status
.
equals
(
2
)){
}
else
if
(
status
.
equals
(
2
)){
//完成退货
//完成退货
returnApply
.
setId
(
statusParam
.
getId
()
);
returnApply
.
setId
(
id
);
returnApply
.
setStatus
(
2
);
returnApply
.
setStatus
(
2
);
returnApply
.
setReceiveTime
(
new
Date
());
returnApply
.
setReceiveTime
(
new
Date
());
returnApply
.
setReceiveMan
(
statusParam
.
getReceiveMan
());
returnApply
.
setReceiveMan
(
statusParam
.
getReceiveMan
());
returnApply
.
setReceiveNote
(
statusParam
.
getReceiveNote
());
returnApply
.
setReceiveNote
(
statusParam
.
getReceiveNote
());
}
else
if
(
status
.
equals
(
3
)){
}
else
if
(
status
.
equals
(
3
)){
//拒绝退货
//拒绝退货
returnApply
.
setId
(
statusParam
.
getId
()
);
returnApply
.
setId
(
id
);
returnApply
.
setStatus
(
3
);
returnApply
.
setStatus
(
3
);
returnApply
.
setHandleTime
(
new
Date
());
returnApply
.
setHandleTime
(
new
Date
());
returnApply
.
setHandleMan
(
statusParam
.
getHandleMan
());
returnApply
.
setHandleMan
(
statusParam
.
getHandleMan
());
...
...
Write
Preview
Supports
Markdown
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