Commit d8c4ed1c authored by Smile's avatar Smile

集运包裹列表,显示包裹退仓处理状态问题修改

parent 943344e8
...@@ -538,7 +538,7 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme ...@@ -538,7 +538,7 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
} }
if (consApprovalDO.getApprovalType().equals(0)&&consApprovalDO.getStatus().equals(2)&& JSON.parseObject(consApprovalDO.getApprovalDetail()).getBoolean("isDeal")){ if (consApprovalDO.getApprovalType().equals(0)&&consApprovalDO.getStatus().equals(2)&& JSON.parseObject(consApprovalDO.getApprovalDetail()).getBoolean("isDeal")){
consBackVO.setReturnStatus(1); consBackVO.setReturnStatus(1);
}else { }else if (consApprovalDO.getApprovalType().equals(0)&&consApprovalDO.getStatus().equals(2)&& !JSON.parseObject(consApprovalDO.getApprovalDetail()).getBoolean("isDeal")) {
consBackVO.setReturnStatus(0); consBackVO.setReturnStatus(0);
} }
//查看是否有撤出订单待审批 //查看是否有撤出订单待审批
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment