lostecho/mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
zhh
2018-10-25 14:15:58 +08:00
parent 7054e92cf4
commit 168dc0b10b
2 changed files with 127 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mall-admin/src/main/java/com/macro/mall/service/impl/OmsOrderReturnApplyServiceImpl.java
View File

@@ -44,7 +44,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
OmsOrderReturnApply returnApply = new OmsOrderReturnApply();
if(status.equals(1)){
//确认退货
returnApply.setId(statusParam.getId());
returnApply.setId(id);
returnApply.setStatus(1);
returnApply.setReturnAmount(statusParam.getReturnAmount());
returnApply.setCompanyAddressId(statusParam.getCompanyAddressId());
@@ -53,14 +53,14 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
returnApply.setHandleNote(statusParam.getHandleNote());
}else if(status.equals(2)){
//完成退货
returnApply.setId(statusParam.getId());
returnApply.setId(id);
returnApply.setStatus(2);
returnApply.setReceiveTime(new Date());
returnApply.setReceiveMan(statusParam.getReceiveMan());
returnApply.setReceiveNote(statusParam.getReceiveNote());
}else if(status.equals(3)){
//拒绝退货
returnApply.setId(statusParam.getId());
returnApply.setId(id);
returnApply.setStatus(3);
returnApply.setHandleTime(new Date());
returnApply.setHandleMan(statusParam.getHandleMan());