提交 71d5baef authored 作者: 刘海泉's avatar 刘海泉

Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into dev

...@@ -54,10 +54,12 @@ public class OrderGoodsDtsListener { ...@@ -54,10 +54,12 @@ public class OrderGoodsDtsListener {
//同步after数据 //同步after数据
log.info("新增:{}",JSON.toJSONString(after)); log.info("新增:{}",JSON.toJSONString(after));
syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode()); syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
sendSaveOrderGoodsAdjustmentPriceMessage(before,after,DtsOperationTypeEnum.INSERT.getCode());
}else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){ }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
log.info("修改:{}",JSON.toJSONString(after)); log.info("修改:{}",JSON.toJSONString(after));
backFillOrderWeight(after); backFillOrderWeight(after);
syncPerformanceProgress(before,after,DtsOperationTypeEnum.UPDATE.getCode()); syncPerformanceProgress(before,after,DtsOperationTypeEnum.UPDATE.getCode());
sendSaveOrderGoodsAdjustmentPriceMessage(before,after,DtsOperationTypeEnum.INSERT.getCode());
}else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){ }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
//数据删除 //数据删除
log.info("删除:{}",JSON.toJSONString(before)); log.info("删除:{}",JSON.toJSONString(before));
......
...@@ -336,7 +336,7 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi ...@@ -336,7 +336,7 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi
} }
item.setOrderDistance(distance); item.setOrderDistance(distance);
item.setOrderNo(data.getOrderNo());
if(Objects.nonNull(data.getSendSystemAddressId())){ if(Objects.nonNull(data.getSendSystemAddressId())){
item.setSendSystemAddressId(data.getSendSystemAddressId()); item.setSendSystemAddressId(data.getSendSystemAddressId());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论