Commit 5b58e670 authored by shiyu's avatar shiyu

寄售单详情时间线

parent 83907fa0
...@@ -205,9 +205,11 @@ public class ConsignSaleServiceImpl implements ConsignSaleService { ...@@ -205,9 +205,11 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleRecords.forEach(consignSaleRecord -> { consignSaleRecords.forEach(consignSaleRecord -> {
ConsignSaleRecordVo consignSaleRecordVo = new ConsignSaleRecordVo(); ConsignSaleRecordVo consignSaleRecordVo = new ConsignSaleRecordVo();
EntityMapper.copyAttribute(consignSaleRecord, consignSaleRecordVo); EntityMapper.copyAttribute(consignSaleRecord, consignSaleRecordVo);
if (consignSaleRecordVo.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode() if (consignSaleRecordVo.getType() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()
|| consignSaleRecordVo.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode()) { || consignSaleRecordVo.getType() == ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode()) {
consignSaleRecordVo.setTypeName("寄售单取消"); consignSaleRecordVo.setTypeName("寄售单取消");
} else if (consignSaleRecordVo.getType() == ConsignSaleEnum.OperateTypeEnum.SALED.getCode()) {
consignSaleRecordVo.setRemark(consignSaleRecordVo.getRemark() + ";货品售出后,请在20天内向用户完成结款。如果实际售出的价格低于建议零售价,请及时通知用户。");
} else { } else {
consignSaleRecordVo.setTypeName(ConsignSaleEnum.OperateTypeEnum.getNameByCode(consignSaleRecord.getType())); consignSaleRecordVo.setTypeName(ConsignSaleEnum.OperateTypeEnum.getNameByCode(consignSaleRecord.getType()));
} }
...@@ -378,8 +380,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService { ...@@ -378,8 +380,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleRecord.setCreateTime(new Date()); consignSaleRecord.setCreateTime(new Date());
consignSaleRecord.setContent("成交金额: " + dto.getDealPrice() + " 元"); consignSaleRecord.setContent("成交金额: " + dto.getDealPrice() + " 元");
consignSaleRecord.setRemark("成交平台: " + (dto.getRemark() == null ? "" : dto.getRemark())); consignSaleRecord.setRemark("成交平台: " + (dto.getRemark() == null ? "" : dto.getRemark()));
consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.FINISH.getCode());
consignSaleRecord.setRemark("成交平台: " + (dto.getRemark() == null ? "" : dto.getRemark()));
consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.SALED.getCode()); consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.SALED.getCode());
consignSaleRecordDao.insert(consignSaleRecord); consignSaleRecordDao.insert(consignSaleRecord);
/* //发送公众号消息 /* //发送公众号消息
......
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