|
@@ -516,12 +516,12 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
|
|
BizOrder bizOrder = bizOrderService.getById(bizAppointmentRecordEditParam.getOrderId());
|
|
BizOrder bizOrder = bizOrderService.getById(bizAppointmentRecordEditParam.getOrderId());
|
|
if(ObjectUtil.isNotNull(bizOrder)){
|
|
if(ObjectUtil.isNotNull(bizOrder)){
|
|
if(!StringUtils.equals(bizOrder.getOrderStatus(),"3") && !StringUtils.equals(bizOrder.getOrderStatus(),"4")){
|
|
if(!StringUtils.equals(bizOrder.getOrderStatus(),"3") && !StringUtils.equals(bizOrder.getOrderStatus(),"4")){
|
|
- throw new CommonException("当前订单不可预约!");
|
|
|
|
|
|
+ throw new CommonException("当前订单不可调度!");
|
|
}
|
|
}
|
|
BizGoodsConf bizGoodsConf = bizGoodsConfService.getById(bizOrder.getDeliveryTimeId());
|
|
BizGoodsConf bizGoodsConf = bizGoodsConfService.getById(bizOrder.getDeliveryTimeId());
|
|
if(ObjectUtil.isNotNull(bizGoodsConf)){
|
|
if(ObjectUtil.isNotNull(bizGoodsConf)){
|
|
if(new Date().getTime() > bizGoodsConf.getConfEndTime().getTime()){
|
|
if(new Date().getTime() > bizGoodsConf.getConfEndTime().getTime()){
|
|
- throw new CommonException("提货时间段已过,不可预约!");
|
|
|
|
|
|
+ throw new CommonException("提货时间段已过,不可调度!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -623,6 +623,7 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ log.info("地磅端对接:overId:"+bizAppointmentRecord.getOverId());
|
|
if(ObjectUtil.isNotEmpty(bizAppointmentRecord.getOverId())){
|
|
if(ObjectUtil.isNotEmpty(bizAppointmentRecord.getOverId())){
|
|
BizExcessConfig excessConfig = bizExcessConfigService.getById(bizAppointmentRecord.getOverId());
|
|
BizExcessConfig excessConfig = bizExcessConfigService.getById(bizAppointmentRecord.getOverId());
|
|
if(ObjectUtil.isNotNull(excessConfig)){
|
|
if(ObjectUtil.isNotNull(excessConfig)){
|