提交 ce88a07b authored 作者: 李瑞鑫's avatar 李瑞鑫

校验不进行ocr识别

上级 0454d134
...@@ -64,8 +64,6 @@ public class PerformanceSdkFeignController { ...@@ -64,8 +64,6 @@ public class PerformanceSdkFeignController {
private final OrderService orderService; private final OrderService orderService;
private final PerformanceProgressService performanceProgressService;
@ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆") @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
@PostMapping("/ownCancelOrderPre") @PostMapping("/ownCancelOrderPre")
......
...@@ -261,8 +261,6 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -261,8 +261,6 @@ public class OrderChildServiceImpl implements OrderChildService {
@Autowired @Autowired
private UserClxFeign userClxFeign; private UserClxFeign userClxFeign;
@Autowired @Autowired
private OrderWeightService orderWeightService;
@Autowired
private OrderChildOperateLimitConfigService orderChildOperateLimitConfigService; private OrderChildOperateLimitConfigService orderChildOperateLimitConfigService;
@Autowired @Autowired
private LoadAppConfig appConfig; private LoadAppConfig appConfig;
...@@ -272,8 +270,6 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -272,8 +270,6 @@ public class OrderChildServiceImpl implements OrderChildService {
private ClxMessageOpenapiFeign clxMessageOpenapiFeign; private ClxMessageOpenapiFeign clxMessageOpenapiFeign;
@Autowired @Autowired
private ClxMessageConfig messageConfig; private ClxMessageConfig messageConfig;
@Autowired
private OrderChildWeighPictureDao pictureDao;
...@@ -3565,46 +3561,6 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -3565,46 +3561,6 @@ public class OrderChildServiceImpl implements OrderChildService {
} }
} }
@Override
public List<HistoryLineTranVolumeChartVO> getHistoryLineTransportVolume(String orderNo) {
//查询近一个月与该订单收发货地线路一致的订单
Optional<List<String>> result = orderService.getMonthSameLineOrderList(orderNo);
if(!result.isPresent()){
log.warn("通过订单号:{} 查找相同线路的订单列列表,返回结果:{}",orderNo,result);
throw new ServiceSystemException(ResultEnum.DATA_ERROR,"获取相同线路的订单列表失败");
}
List<BigDecimal> priceList = orderGoodsAdjustmentPriceService.getNoRepeatAdjustmentPriceRecord(result.get());
List<HistoryLineTranVolumeChartVO> charts = new ArrayList<>();
if(CollectionUtils.isEmpty(priceList)){
return charts;
}
//查询相同路线的订单下的所有运单
List<OrderChild> childs = orderChildDao.listCompleteByOrderNos(result.get());
if(CollectionUtils.isEmpty(childs)){
priceList.forEach(item-> charts.add(HistoryLineTranVolumeChartVO.builder()
.pendingOrderFreight(item).number(0).build()));
return charts;
}
LinkedHashMap<BigDecimal,Integer> priceMap =
priceList.stream().collect(Collectors.toMap(item->item,item->0,
(existing, replacement) -> existing, // 如果有冲突的键,则保留现有的键
LinkedHashMap::new));
//进行相同路线运费拉运单数统计
childs.forEach(item->{
if(priceMap.containsKey(item.getFreightPrice())){
priceMap.put(item.getFreightPrice(),priceMap.get(item.getFreightPrice()) + 1);
}
});
for (Map.Entry<BigDecimal, Integer> entry : priceMap.entrySet()) {
charts.add(HistoryLineTranVolumeChartVO.builder().pendingOrderFreight(entry.getKey()).number(
entry.getValue()).build());
}
return charts;
}
@Override @Override
public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) { public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) {
...@@ -3790,60 +3746,4 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -3790,60 +3746,4 @@ public class OrderChildServiceImpl implements OrderChildService {
} }
} }
@Override
public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) {
//查询运单信息
OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(DATA_NOT_FIND);
//返回对象
NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
//组装配置信息
RequestConfig config = new RequestConfig()
.setAppId(app.getAppNo())
.setAppKey(app.getAppKey())
.setGatewayUrl(app.getCallback());
//通过订单号查询监装监卸信息
SupplyChainSupervisionLoadAction action = new SupplyChainSupervisionLoadAction();
action.setOrderNo(orderChild.getOrderNo());
action.setType(param.getType());
log.info("请求获取监装监卸信息参数,{}",action);
Result<SupervisionLoadInfoDto> supervisionLoadInfoDto = OpenClient.doAction(config, action);
if(!supervisionLoadInfoDto.succeed()){//接口调用失败
result.setNeedAlert(0);
return result;
//throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "获取监装监卸信息失败");
}
SupervisionLoadInfoDto supervisionLoadInfo = supervisionLoadInfoDto.getData();//监装信息
if(Objects.nonNull(supervisionLoadInfo)){//有监装信息
//通过运单号查询监装监卸子任务状态
SupplyChainSupervisionLoadTruckAction truckAction = new SupplyChainSupervisionLoadTruckAction();
truckAction.setChildNo(param.getChildNo());
truckAction.setType(param.getType());
log.info("请求获取监装监卸子任务信息参数,{}",truckAction);
Result<SupervisionLoadTruckInfoDto> supervisionLoadTruckInfoDto = OpenClient.doAction(config, truckAction);
if(!supervisionLoadTruckInfoDto.succeed()){//接口调用失败
result.setNeedAlert(0);
return result;
//throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "获取监装监卸信息子任务失败");
}
SupervisionLoadTruckInfoDto supervisionLoadTruckInfo = supervisionLoadTruckInfoDto.getData();
if(Objects.nonNull(supervisionLoadTruckInfo)){
if(supervisionLoadTruckInfo.getLoadStatus()){
result.setNeedAlert(1);
result.setLocation(supervisionLoadInfo.getTaskAddress());
result.setMobile(supervisionLoadInfo.getTaskMobile());
result.setSupervisor(supervisionLoadInfo.getTaskContracts());
return result;
}
}
}
result.setNeedAlert(0);
return result;
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论