Skip to content

C
clx-performance
提交 0f491453 authored 作者: 胡宁宁's avatar 胡宁宁
浏览文件
操作

Merge remote-tracking branch 'origin/v17.5_order_child_sync_broker_20240617'…

Merge remote-tracking branch 'origin/v17.5_order_child_sync_broker_20240617' into v17.5_order_child_sync_broker_20240617
上级 2e03269b 8a1fd4e8
隐藏空白字符变更
内嵌 并排
正在显示 包含 83 行增加 和 83 行删除
performance-web/src/main/java/com/clx/performance/job/OrderChildPaySyncTransportJob.java
浏览文件 @ 0f491453
...@@ -52,28 +52,28 @@ public class OrderChildPaySyncTransportJob { ...@@ -52,28 +52,28 @@ public class OrderChildPaySyncTransportJob {
* 同步网络货运运单支付(禁用网络货运同步) * 同步网络货运运单支付(禁用网络货运同步)
*/ */
// @XxlJob("orderChildPaySyncTransportJob") // @XxlJob("orderChildPaySyncTransportJob")
public void orderChildPaySyncTransportJob() { // public void orderChildPaySyncTransportJob() {
List<OrderChildSyncTransportRecord> recordList = orderChildSyncTransportRecordDao.selectListForJob(); // List<OrderChildSyncTransportRecord> recordList = orderChildSyncTransportRecordDao.selectListForJob();
if (CollectionUtil.isEmpty(recordList)) { // if (CollectionUtil.isEmpty(recordList)) {
return; // return;
} // }
//
List<String> orderChilList = recordList.stream().map(OrderChildSyncTransportRecord::getChildNo).collect(Collectors.toList()); // List<String> orderChilList = recordList.stream().map(OrderChildSyncTransportRecord::getChildNo).collect(Collectors.toList());
OrderChildPaySyncParam param = new OrderChildPaySyncParam(); // OrderChildPaySyncParam param = new OrderChildPaySyncParam();
param.setChildNoList(orderChilList); // param.setChildNoList(orderChilList);
HttpDTO httpDTO = transportFeignService.orderChildPaySync(param); // HttpDTO httpDTO = transportFeignService.orderChildPaySync(param);
String decrypt = ThirdComponent.decrypt(httpDTO.getData()); // String decrypt = ThirdComponent.decrypt(httpDTO.getData());
OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class); // OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
if (bean.getCode() == 0) { // if (bean.getCode() == 0) {
for (OrderChildSyncTransportRecord record : recordList) { // for (OrderChildSyncTransportRecord record : recordList) {
OrderChildSyncTransportRecord update = new OrderChildSyncTransportRecord(); // OrderChildSyncTransportRecord update = new OrderChildSyncTransportRecord();
update.setId(record.getId()); // update.setId(record.getId());
update.setStatus(1); // update.setStatus(1);
orderChildSyncTransportRecordDao.updateEntityByKey(update); // orderChildSyncTransportRecordDao.updateEntityByKey(update);
} // }
} // }
//
} // }
/** /**
......
performance-web/src/main/java/com/clx/performance/job/OrderChildSyncTransportInvoiceExceptionJob.java
浏览文件 @ 0f491453
...@@ -52,65 +52,65 @@ public class OrderChildSyncTransportInvoiceExceptionJob { ...@@ -52,65 +52,65 @@ public class OrderChildSyncTransportInvoiceExceptionJob {
* 同步网络货运（禁用网络货运同步） * 同步网络货运（禁用网络货运同步）
*/ */
// @XxlJob("orderChildSyncTransportInvoiceExceptionJob") // @XxlJob("orderChildSyncTransportInvoiceExceptionJob")
@Transactional(rollbackFor = Exception.class) // @Transactional(rollbackFor = Exception.class)
public void orderChildSyncTransportInvoiceExceptionJob() { // public void orderChildSyncTransportInvoiceExceptionJob() {
//只查询同步异常的网络货运任务 // //只查询同步异常的网络货运任务
List<OrderChildSyncTransportInvoiceRecord> recordList = orderChildSyncTransportInvoiceRecordDao.selectListForJob(); // List<OrderChildSyncTransportInvoiceRecord> recordList = orderChildSyncTransportInvoiceRecordDao.selectListForJob();
if (CollectionUtil.isEmpty(recordList)) { // if (CollectionUtil.isEmpty(recordList)) {
return; // return;
} // }
List<Integer> ids = new LinkedList<>(); // List<Integer> ids = new LinkedList<>();
//
for (OrderChildSyncTransportInvoiceRecord record : recordList) { // for (OrderChildSyncTransportInvoiceRecord record : recordList) {
log.info("orderChildSyncTransportInvoiceExceptionJob执行：{}", JSONUtil.parse(record)); // log.info("orderChildSyncTransportInvoiceExceptionJob执行：{}", JSONUtil.parse(record));
if (record.getCreateTime().plusMinutes(10).isBefore(LocalDateTime.now())) { // if (record.getCreateTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
log.info("当前记录运单号:{},生成不足10分钟,先不执行", record.getChildNo()); // log.info("当前记录运单号:{},生成不足10分钟,先不执行", record.getChildNo());
continue; // continue;
} // }
//
String data = transportFeignService.getRiskStatus(ThirdOrderChildRiskStatusParam.builder().childNo(record.getChildNo()).build()).getData(); // String data = transportFeignService.getRiskStatus(ThirdOrderChildRiskStatusParam.builder().childNo(record.getChildNo()).build()).getData();
String decrypt = ThirdComponent.decrypt(data); // String decrypt = ThirdComponent.decrypt(data);
Result result = JSONUtil.toBean(decrypt, Result.class); // Result result = JSONUtil.toBean(decrypt, Result.class);
if (result.succeed()) { // if (result.succeed()) {
SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(record.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND); // SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(record.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(record.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND); // SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(record.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
//
JSON json = JSONUtil.parse(result.getData()); // JSON json = JSONUtil.parse(result.getData());
Object status = json.getByPath("status"); // Object status = json.getByPath("status");
ids.add(record.getId()); // ids.add(record.getId());
OrderChildSyncDTO bean = new OrderChildSyncDTO(); // OrderChildSyncDTO bean = new OrderChildSyncDTO();
bean.setCode(0); // bean.setCode(0);
OrderChildSyncResultDTO dto = new OrderChildSyncResultDTO(); // OrderChildSyncResultDTO dto = new OrderChildSyncResultDTO();
OrderChild orderChild = orderChildDao.getByChildNo(record.getChildNo()).get(); // OrderChild orderChild = orderChildDao.getByChildNo(record.getChildNo()).get();
log.info("查询网络货运结果数据：{}", JSONUtil.parse(result)); // log.info("查询网络货运结果数据：{}", JSONUtil.parse(result));
if (ObjectUtil.equal(status, 1)) { // if (ObjectUtil.equal(status, 1)) {
dto.setStatus(1); // dto.setStatus(1);
bean.setData(dto); // bean.setData(dto);
orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail, // orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
SettlementOwnerEnum.InvoiceType.ONLINE.getCode(), settlementDriverDetail); // SettlementOwnerEnum.InvoiceType.ONLINE.getCode(), settlementDriverDetail);
} else if (ObjectUtil.equal(status, 0)){ // } else if (ObjectUtil.equal(status, 0)){
dto.setStatus(2); // dto.setStatus(2);
bean.setData(dto); // bean.setData(dto);
orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail, // orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail); // SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail);
//
}else if (ObjectUtil.equal(status, 2)){ // }else if (ObjectUtil.equal(status, 2)){
// orderChildPaySync.transportOrderChildProcess(orderChild); //// orderChildPaySync.transportOrderChildProcess(orderChild);
dto.setStatus(2); // dto.setStatus(2);
bean.setData(dto); // bean.setData(dto);
orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail, // orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail); // SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail);
} else { // } else {
Object riskReason = json.getByPath("riskReason"); // Object riskReason = json.getByPath("riskReason");
OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord(); // OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
entity.setChildNo(json.getByPath("childNo").toString()); // entity.setChildNo(json.getByPath("childNo").toString());
entity.setType(TransportSyncTypeEnum.Type.NO_PASS.getCode()); // entity.setType(TransportSyncTypeEnum.Type.NO_PASS.getCode());
entity.setRemark(riskReason == null ? "" : riskReason.toString()); // entity.setRemark(riskReason == null ? "" : riskReason.toString());
orderChildSyncTransportInvoiceRecordDao.saveEntity(entity); // orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
} // }
} // }
} // }
//
orderChildSyncTransportInvoiceRecordDao.deleteByKeys(ids); // orderChildSyncTransportInvoiceRecordDao.deleteByKeys(ids);
} // }
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论