Skip to content

J
jiedao-api-boot-master
Commit e6f9312f authored by 332784038@qq.com's avatar 332784038@qq.com Committed by wux
Browse files
Options

批量特价付费模式变动修改审批通过bug修复

parent 42da0f55
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 0 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ e6f9312f
......@@ -5488,6 +5488,18 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoVO.setName(vo.getProdTitleZh() + "清关费管理折扣");
applyInfoVO.setOrgValue(vo.getOrgClearanceFreight().toString() + currencyRespDTOMap.get(vo.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getClearanceFreightVolume().intValue()).getTitleZh());
applyInfoVO.setNewValue(vo.getClearanceFreight().toString() + currencyRespDTOMap.get(vo.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getClearanceFreightVolume().intValue()).getTitleZh());
if (vo.getOrgCharging() == 0) {
applyInfoVO.setOrgValue(vo.getOrgClearanceFreight().toString() + currencyRespDTOMap.get(vo.getOrgClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getClearanceFreightVolume().intValue()).getTitleZh());
}else {
applyInfoVO.setOrgValue("无/none");
}
if (vo.getCharging() == 0) {
applyInfoVO.setNewValue(vo.getClearanceFreight().toString() + currencyRespDTOMap.get(vo.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getClearanceFreightVolume().intValue()).getTitleZh());
}else {
//
vo.setClearanceFreight(BigDecimal.ZERO);
applyInfoVO.setOrgValue("无/none");
}
applyInfoVOList.add(applyInfoVO);
}
// TODO 订单核销前都可以申请
......@@ -5692,7 +5704,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 需要标记为固定成交单价， 且需要重置批量加价金额为0
oi.setCharging(batchApplyOrderItemDetailVO.getCharging());
oi.setOneClearanceFreight(batchApplyOrderItemDetailVO.getClearanceFreight());
oi.setOneClearanceFreight(Objects.nonNull(batchApplyOrderItemDetailVO.getClearanceFreight())?batchApplyOrderItemDetailVO.getClearanceFreight():BigDecimal.ZERO);
oi.setClearanceFreightCurrency(batchApplyOrderItemDetailVO.getClearanceFreightCurrency().intValue());
oi.setClearanceFreightVolume(batchApplyOrderItemDetailVO.getClearanceFreightVolume());
oi.setOneSeaFreight(batchApplyOrderItemDetailVO.getFreight());
oi.setSeaFreightCurrency(batchApplyOrderItemDetailVO.getFreightCurrency().intValue());
oi.setSeaFreightVolume(batchApplyOrderItemDetailVO.getFreightVolume());
oi.setMarkupSeaFreight(BigDecimal.ZERO);
oi.setMarkupClearanceFreight(BigDecimal.ZERO);
oi.setIsPriced(Boolean.TRUE);
......@@ -5760,7 +5777,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 需要标记为固定成交单价， 且需要重置批量加价金额为0
oi.setCharging(specialApplyVO.getCharging());
oi.setOneClearanceFreight(specialApplyVO.getClearanceFreight());
oi.setOneClearanceFreight(Objects.nonNull(specialApplyVO.getClearanceFreight())?specialApplyVO.getClearanceFreight():BigDecimal.ZERO);
oi.setClearanceFreightCurrency(specialApplyVO.getClearanceFreightCurrency().intValue());
oi.setClearanceFreightVolume(specialApplyVO.getClearanceFreightVolume());
oi.setOneSeaFreight(specialApplyVO.getFreight());
oi.setSeaFreightCurrency(specialApplyVO.getFreightCurrency().intValue());
oi.setSeaFreightVolume(specialApplyVO.getFreightVolume());
oi.setMarkupSeaFreight(BigDecimal.ZERO);
oi.setMarkupClearanceFreight(BigDecimal.ZERO);
oi.setIsPriced(Boolean.TRUE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment