Commit 00505ec1 authored by 332784038@qq.com's avatar 332784038@qq.com

特价相关申请全包价付费模式时确认清关费设置为0

parent 85eb191c
...@@ -5337,6 +5337,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5337,6 +5337,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (specialApplyVO.getCharging() == 0) { if (specialApplyVO.getCharging() == 0) {
applyInfoVO.setNewValue(specialApplyVO.getClearanceFreight().toString() + currencyRespDTOMap.get(specialApplyVO.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(specialApplyVO.getClearanceFreightVolume().intValue()).getTitleZh()); applyInfoVO.setNewValue(specialApplyVO.getClearanceFreight().toString() + currencyRespDTOMap.get(specialApplyVO.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(specialApplyVO.getClearanceFreightVolume().intValue()).getTitleZh());
}else { }else {
// 当付费模式修改为全包价时,确保清关费设置为0
specialApplyVO.setClearanceFreight(BigDecimal.ZERO);
applyInfoVO.setOrgValue("无/none"); applyInfoVO.setOrgValue("无/none");
} }
applyInfoVOList.add(applyInfoVO); applyInfoVOList.add(applyInfoVO);
...@@ -5360,6 +5362,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5360,6 +5362,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (specialApplyVO.getCharging() == 0) { if (specialApplyVO.getCharging() == 0) {
applyInfoVO.setNewValue(specialApplyVO.getClearanceFreight().toString() + currencyRespDTOMap.get(specialApplyVO.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(specialApplyVO.getClearanceFreightVolume().intValue()).getTitleZh()); applyInfoVO.setNewValue(specialApplyVO.getClearanceFreight().toString() + currencyRespDTOMap.get(specialApplyVO.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(specialApplyVO.getClearanceFreightVolume().intValue()).getTitleZh());
}else { }else {
// 当付费模式修改为全包价时,确保清关费设置为0
specialApplyVO.setClearanceFreight(BigDecimal.ZERO);
applyInfoVO.setOrgValue("无/none"); applyInfoVO.setOrgValue("无/none");
} }
applyInfoVOList.add(applyInfoVO); applyInfoVOList.add(applyInfoVO);
...@@ -5478,6 +5482,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5478,6 +5482,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (vo.getCharging() == 0) { if (vo.getCharging() == 0) {
applyInfoVO.setNewValue(vo.getClearanceFreight().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());
}else { }else {
// 当付费模式修改为全包价时,确保清关费设置为0
vo.setClearanceFreight(BigDecimal.ZERO);
applyInfoVO.setOrgValue("无/none"); applyInfoVO.setOrgValue("无/none");
} }
applyInfoVOList.add(applyInfoVO); applyInfoVOList.add(applyInfoVO);
...@@ -5501,7 +5507,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5501,7 +5507,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (vo.getCharging() == 0) { if (vo.getCharging() == 0) {
applyInfoVO.setNewValue(vo.getClearanceFreight().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());
}else { }else {
// // 当付费模式修改为全包价时,确保清关费设置为0
vo.setClearanceFreight(BigDecimal.ZERO); vo.setClearanceFreight(BigDecimal.ZERO);
applyInfoVO.setOrgValue("无/none"); applyInfoVO.setOrgValue("无/none");
} }
......
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