提交 ea6e98a3 authored 作者: aiqingguo's avatar aiqingguo

司机取消

上级 a00e5e38
...@@ -112,6 +112,8 @@ public class OrderChildVO { ...@@ -112,6 +112,8 @@ public class OrderChildVO {
private Integer cancelType; private Integer cancelType;
@ApiModelProperty(value = "取消原因", example = "抢错了") @ApiModelProperty(value = "取消原因", example = "抢错了")
private String cancelRemark; private String cancelRemark;
@ApiModelProperty(value = "司机取消详细原因", example = "司机取消详细原因")
private String cancelDetail;
@ApiModelProperty(value = "磅单审核状态 0 待审核 1 审核通过 2 审核驳回", example = "0") @ApiModelProperty(value = "磅单审核状态 0 待审核 1 审核通过 2 审核驳回", example = "0")
private Integer poundStatus; private Integer poundStatus;
@ApiModelProperty(value = "磅单审核驳回原因", example = "交货信息错误") @ApiModelProperty(value = "磅单审核驳回原因", example = "交货信息错误")
......
...@@ -83,6 +83,8 @@ public class CarrierOrderChildDetailVO { ...@@ -83,6 +83,8 @@ public class CarrierOrderChildDetailVO {
private Integer cancelType; private Integer cancelType;
@ApiModelProperty(value = "取消原因", example = "抢错了") @ApiModelProperty(value = "取消原因", example = "抢错了")
private String cancelRemark; private String cancelRemark;
@ApiModelProperty(value = "司机取消详细原因", example = "司机取消详细原因")
private String cancelDetail;
@ApiModelProperty(value = "状态", example = "0") @ApiModelProperty(value = "状态", example = "0")
private Integer status; private Integer status;
......
...@@ -71,6 +71,7 @@ public class OrderChild implements HasKey<Integer> { ...@@ -71,6 +71,7 @@ public class OrderChild implements HasKey<Integer> {
private String cancelRemark; //取消原因 private String cancelRemark; //取消原因
private Integer cancelType; //司机取消原因类型 private Integer cancelType; //司机取消原因类型
private String cancelDetail; //司机取消详细原因
private Integer poundStatus; //磅单审核状态 0 待审核 1 审核通过 2 审核驳回 private Integer poundStatus; //磅单审核状态 0 待审核 1 审核通过 2 审核驳回
private Integer status; //状态 private Integer status; //状态
......
...@@ -1029,6 +1029,7 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -1029,6 +1029,7 @@ public class OrderChildServiceImpl implements OrderChildService {
if (param.getCancelType() != null){ if (param.getCancelType() != null){
orderChild.setCancelType(param.getCancelType()); orderChild.setCancelType(param.getCancelType());
orderChild.setCancelRemark(OrderChildEnum.CancelType.getByCode(param.getCancelType()).orElse(OrderChildEnum.CancelType.OTHER).getMsg()); orderChild.setCancelRemark(OrderChildEnum.CancelType.getByCode(param.getCancelType()).orElse(OrderChildEnum.CancelType.OTHER).getMsg());
orderChild.setCancelDetail(param.getRemark());
} }
else { else {
orderChild.setCancelRemark(param.getRemark()); orderChild.setCancelRemark(param.getRemark());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论