|
|
@ -253,7 +253,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
if (ObjectUtil.isNotEmpty(limitOrder)) {
|
|
|
|
if (ObjectUtil.isNotEmpty(limitOrder)) {
|
|
|
|
throw new BusinessLogicException("您有一笔正在进行中的到站回收订单!");
|
|
|
|
throw new BusinessLogicException("您有一笔正在进行中的到站回收订单!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Recycler recycler = recyclerService.getRecyclerById(dzOrderCreateVO.getRecyclerId());
|
|
|
|
String recyclerId = dzOrderCreateVO.getRecyclerId();
|
|
|
|
|
|
|
|
Recycler recycler = recyclerService.getRecyclerById(recyclerId);
|
|
|
|
if (StrUtil.isEmpty(recycler.getStationId())) {
|
|
|
|
if (StrUtil.isEmpty(recycler.getStationId())) {
|
|
|
|
throw new BusinessLogicException("警告,该回收员未绑定回收站点!");
|
|
|
|
throw new BusinessLogicException("警告,该回收员未绑定回收站点!");
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -271,6 +272,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
recycleOrder.setOrderStatus(OrderStatusEnum.FINISHED); // 直接完成
|
|
|
|
recycleOrder.setOrderStatus(OrderStatusEnum.FINISHED); // 直接完成
|
|
|
|
recycleOrder.setCreatorTime(now);
|
|
|
|
recycleOrder.setCreatorTime(now);
|
|
|
|
recycleOrder.setCompleteTime(now); // 完成时间
|
|
|
|
recycleOrder.setCompleteTime(now); // 完成时间
|
|
|
|
|
|
|
|
recycleOrder.setStaffsId(recyclerId); // 回收员id
|
|
|
|
this.saveRecycleOrder(recycleOrder, enterpriseId);
|
|
|
|
this.saveRecycleOrder(recycleOrder, enterpriseId);
|
|
|
|
|
|
|
|
|
|
|
|
// 创建订单明细
|
|
|
|
// 创建订单明细
|
|
|
|