寄售单详情时间线

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ConsignSaleServiceImpl.java

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