提交 79421ce0 authored 作者: huyufan's avatar huyufan

临时注释相关

上级 84043e73
......@@ -44,27 +44,27 @@ public abstract class GoodsOrderStrategy {
throw new ServiceSystemException(ResultEnum.DATA_ERROR,"订单已暂停,无法进行提量");
}
//多个定向单不允许车辆重复
List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
Set<String> set = new HashSet<>();
for (OrderGoodsChildParams item : orderGoodsChildParams) {
if(CollectionUtils.isNotEmpty(item.getTruckList())){
int lastSize = set.size() + item.getTruckList().size();
set.addAll(item.getTruckList());
if (!Objects.equals(lastSize,set.size() +item.getTruckList().size())) {
throw new ServiceSystemException(ResultEnum.DATA_ERROR,"定向单选择车辆重复");
}
}
}
if(CollectionUtils.isNotEmpty(set)){
OrderGoodsTruckBindDao orderGoodsTruckBindDao = SpringContextUtils.getBeanByClass(OrderGoodsTruckBindDao.class);
List<OrderGoodsTruckBind> binds = orderGoodsTruckBindDao.judgeTruckIsBindDxOrder(set);
if(CollectionUtils.isNotEmpty(binds)){
List<String> repeatBind = binds.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
String trucks = String.join(", ", repeatBind);
throw new ServiceSystemException(ResultEnum.DATA_ERROR,"已被定向单绑定车辆:"+ trucks);
}
}
// List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
// Set<String> set = new HashSet<>();
// for (OrderGoodsChildParams item : orderGoodsChildParams) {
// if(CollectionUtils.isNotEmpty(item.getTruckList())){
// int lastSize = set.size() + item.getTruckList().size();
// set.addAll(item.getTruckList());
// if (!Objects.equals(lastSize,set.size() +item.getTruckList().size())) {
// throw new ServiceSystemException(ResultEnum.DATA_ERROR,"定向单选择车辆重复");
// }
// }
// }
//
// if(CollectionUtils.isNotEmpty(set)){
// OrderGoodsTruckBindDao orderGoodsTruckBindDao = SpringContextUtils.getBeanByClass(OrderGoodsTruckBindDao.class);
// List<OrderGoodsTruckBind> binds = orderGoodsTruckBindDao.judgeTruckIsBindDxOrder(set);
// if(CollectionUtils.isNotEmpty(binds)){
// List<String> repeatBind = binds.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
// String trucks = String.join(", ", repeatBind);
// throw new ServiceSystemException(ResultEnum.DATA_ERROR,"已被定向单绑定车辆:"+ trucks);
// }
// }
//根据不同的订单类型创建不同的货单
LocalDateTime sendLazyTime = goodsOrderProcess(orderGoodsParams, orderInfo, now);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论