Commit 6d8ec8bf authored by shiyu's avatar shiyu

后台寄售单列表查询

parent 16ea963e
......@@ -140,8 +140,11 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleVo.setRemark("用户主动取消");
} else {
consignSaleVo.setCancelType(ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getDes());
ConsignSaleRecord consignSaleRecord = consignSaleRecords.stream().filter(s->s.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()).collect(Collectors.toList()).get(0);
consignSaleVo.setRemark(consignSaleRecord.getRemark().startsWith("理由:")?consignSaleRecord.getRemark().split(":")[1]:consignSaleRecord.getRemark());
List<ConsignSaleRecord> saleRecordList= consignSaleRecords.stream().filter(s->s.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(saleRecordList)) {
ConsignSaleRecord consignSaleRecord = saleRecordList.get(0);
consignSaleVo.setRemark(consignSaleRecord.getRemark().startsWith("理由:")?consignSaleRecord.getRemark().split(":")[1]:consignSaleRecord.getRemark());
}
}
}
consignSaleVoList.add(consignSaleVo);
......
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