Skip to content

C
clx-performance
提交 7f83749b authored 作者: 刘海泉's avatar 刘海泉
浏览文件
操作

Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test

# Conflicts: # performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java Former-commit-id: 50c0e5dc
上级 d41051a7 19888ca0
隐藏空白字符变更
内嵌 并排
正在显示 包含 1 行增加 和 1 行删除
performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
浏览文件 @ 7f83749b
...@@ -175,7 +175,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea ...@@ -175,7 +175,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
orderGoodsVO.setUnloadEndTime(orderInfoFeign.getUnloadEndTime()); orderGoodsVO.setUnloadEndTime(orderInfoFeign.getUnloadEndTime());
orderGoodsVO.setLoadBeginTime(orderInfoFeign.getLoadBeginTime()); orderGoodsVO.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
orderGoodsVO.setLoadEndTime(orderInfoFeign.getLoadEndTime()); orderGoodsVO.setLoadEndTime(orderInfoFeign.getLoadEndTime());
orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0 ? BigDecimal.ZERO : orderGoodsVO.getResidueTransportWeight()); orderGoodsVO.setResidueTransportWeight(residueWeight);
//货源地信息 //货源地信息
orderGoodsVO.setSendContact(orderInfoFeign.getSendContact()); orderGoodsVO.setSendContact(orderInfoFeign.getSendContact());
orderGoodsVO.setSendContactPhone(orderInfoFeign.getSendContactPhone()); orderGoodsVO.setSendContactPhone(orderInfoFeign.getSendContactPhone());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论