提交 d1cad4ee authored 作者: 艾庆国's avatar 艾庆国

承运与无车承运对接

上级 6b5664ee
...@@ -25,20 +25,21 @@ public class NetworkSyncComponent { ...@@ -25,20 +25,21 @@ public class NetworkSyncComponent {
public void ownerSettlementSync(SettlementOwner settlementOwner, List<SettlementOwnerDetail> settlementOwnerDetailList){ public void ownerSettlementSync(SettlementOwner settlementOwner, List<SettlementOwnerDetail> settlementOwnerDetailList){
//TODO 通知网络货运做货主计费开票标识通知 //TODO 通知网络货运做货主计费开票标识通知
OwnerSettlementSyncParam param = new OwnerSettlementSyncParam(); // 禁用网络货运同步
String mobile = ownerFeign.getOwnerInfo(settlementOwner.getOwnerUserNo()).getData().getMobile(); // OwnerSettlementSyncParam param = new OwnerSettlementSyncParam();
param.setOwnerMobile(mobile); // String mobile = ownerFeign.getOwnerInfo(settlementOwner.getOwnerUserNo()).getData().getMobile();
List<OwnerSettlementSyncParam.SettlementItem> settlementList = new LinkedList<>(); // param.setOwnerMobile(mobile);
for (SettlementOwnerDetail settlementOwnerDetail : settlementOwnerDetailList) { // List<OwnerSettlementSyncParam.SettlementItem> settlementList = new LinkedList<>();
String childNo = settlementOwnerDetail.getChildNo(); // for (SettlementOwnerDetail settlementOwnerDetail : settlementOwnerDetailList) {
OwnerSettlementSyncParam.SettlementItem item = new OwnerSettlementSyncParam.SettlementItem(); // String childNo = settlementOwnerDetail.getChildNo();
item.setChildNo(childNo); // OwnerSettlementSyncParam.SettlementItem item = new OwnerSettlementSyncParam.SettlementItem();
item.setSettlementNo(settlementOwnerDetail.getSettlementNo()); // item.setChildNo(childNo);
settlementList.add(item); // item.setSettlementNo(settlementOwnerDetail.getSettlementNo());
} // settlementList.add(item);
param.setSettlementList(settlementList); // }
HttpDTO httpDTO = transportFeignService.ownerSettlementSync(param); // param.setSettlementList(settlementList);
String decrypt = ThirdComponent.decrypt(httpDTO.getData()); // HttpDTO httpDTO = transportFeignService.ownerSettlementSync(param);
log.info("通知网络货运做货主计费开票标识通知请求解密后:{}", decrypt); // String decrypt = ThirdComponent.decrypt(httpDTO.getData());
// log.info("通知网络货运做货主计费开票标识通知请求解密后:{}", decrypt);
} }
} }
...@@ -49,7 +49,7 @@ public class OrderChildPaySyncTransportJob { ...@@ -49,7 +49,7 @@ public class OrderChildPaySyncTransportJob {
private final OrderGoodsDao orderGoodsDao; private final OrderGoodsDao orderGoodsDao;
/** /**
* 同步网络货运 * 同步网络货运运单支付(禁用网络货运同步)
*/ */
// @XxlJob("orderChildPaySyncTransportJob") // @XxlJob("orderChildPaySyncTransportJob")
public void orderChildPaySyncTransportJob() { public void orderChildPaySyncTransportJob() {
......
...@@ -49,7 +49,7 @@ public class OrderChildSyncTransportInvoiceExceptionJob { ...@@ -49,7 +49,7 @@ public class OrderChildSyncTransportInvoiceExceptionJob {
private final SettlementDriverDetailDao settlementDriverDetailDao; private final SettlementDriverDetailDao settlementDriverDetailDao;
/** /**
* 同步网络货运(禁用) * 同步网络货运(禁用网络货运同步
*/ */
// @XxlJob("orderChildSyncTransportInvoiceExceptionJob") // @XxlJob("orderChildSyncTransportInvoiceExceptionJob")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
......
...@@ -111,7 +111,7 @@ public class OrderChildSyncTransportListener { ...@@ -111,7 +111,7 @@ public class OrderChildSyncTransportListener {
// settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), // settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),
// orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail)); // orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
// // 同步网络货运 // // 同步网络货运(禁用网络货运同步)
// ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail); // ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
// HttpDTO httpDTOResult = transportFeignService.orderChildSync(param); // HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
// String decrypt = ThirdComponent.decrypt(httpDTOResult.getData()); // String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论