Skip to content

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

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

parent e6f9312f
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 6 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ ad6656ea
......@@ -5348,6 +5348,18 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoVO.setName(specialApplyVO.getProdTitleZh() + "清关费优惠");
applyInfoVO.setOrgValue(specialApplyVO.getOrgClearanceFreight().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());
if (specialApplyVO.getOrgCharging() == 0) {
applyInfoVO.setOrgValue(specialApplyVO.getOrgClearanceFreight().toString() + currencyRespDTOMap.get(specialApplyVO.getOrgClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(specialApplyVO.getClearanceFreightVolume().intValue()).getTitleZh());
}else {
applyInfoVO.setOrgValue("无/none");
}
if (specialApplyVO.getCharging() == 0) {
applyInfoVO.setNewValue(specialApplyVO.getClearanceFreight().toString() + currencyRespDTOMap.get(specialApplyVO.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(specialApplyVO.getClearanceFreightVolume().intValue()).getTitleZh());
}else {
// 当付费模式修改为全包价时，确保清关费设置为0
specialApplyVO.setClearanceFreight(BigDecimal.ZERO);
applyInfoVO.setOrgValue("无/none");
}
applyInfoVOList.add(applyInfoVO);
}
// TODO 只能装柜前、到港后申请
......@@ -5363,9 +5375,21 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoVO.setName(specialApplyVO.getProdTitleZh() + "清关费管理折扣");
applyInfoVO.setOrgValue(specialApplyVO.getOrgClearanceFreight().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());
if (specialApplyVO.getOrgCharging() == 0) {
applyInfoVO.setOrgValue(specialApplyVO.getOrgClearanceFreight().toString() + currencyRespDTOMap.get(specialApplyVO.getOrgClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(specialApplyVO.getClearanceFreightVolume().intValue()).getTitleZh());
}else {
applyInfoVO.setOrgValue("无/none");
}
if (specialApplyVO.getCharging() == 0) {
applyInfoVO.setNewValue(specialApplyVO.getClearanceFreight().toString() + currencyRespDTOMap.get(specialApplyVO.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(specialApplyVO.getClearanceFreightVolume().intValue()).getTitleZh());
}else {
// 当付费模式修改为全包价时，确保清关费设置为0
specialApplyVO.setClearanceFreight(BigDecimal.ZERO);
applyInfoVO.setOrgValue("无/none");
}
applyInfoVOList.add(applyInfoVO);
}
// TODO 订单核销前都可以申请
// 订单核销前都可以申请
key = WorkFlowEmus.ORDER_MANAGE_DISCOUNTS.getKey();
break;
case 3:
......@@ -5465,14 +5489,26 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
switch (specialBatchApplyVO.getApplyType()) {
case 31:
applyInfoVO.setName(vo.getProdTitleZh() + (vo.getCharging() == 1 ? "全包价优惠" : "运费优惠"));
applyInfoVO.setOrgValue(vo.getOrgFreight().toString() + currencyRespDTOMap.get(vo.getFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getFreightVolume().intValue()).getTitleZh());
applyInfoVO.setOrgValue(vo.getOrgFreight().toString() + currencyRespDTOMap.get(vo.getOrgFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getFreightVolume().intValue()).getTitleZh());
applyInfoVO.setNewValue(vo.getFreight().toString() + currencyRespDTOMap.get(vo.getFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getFreightVolume().intValue()).getTitleZh());
applyInfoVOList.add(applyInfoVO);
if (vo.getCharging() == 0) {
if (vo.getOrgCharging() == 0 || vo.getCharging() == 0) {
applyInfoVO = new ApplyInfoVO();
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 {
// 当付费模式修改为全包价时，确保清关费设置为0
vo.setClearanceFreight(BigDecimal.ZERO);
applyInfoVO.setOrgValue("无/none");
}
applyInfoVOList.add(applyInfoVO);
}
// TODO 只能装柜前、到港后申请
......@@ -5480,10 +5516,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
break;
case 32:
applyInfoVO.setName(vo.getProdTitleZh() + (vo.getCharging() == 1 ? "全包价管理折扣" : "运费管理折扣"));
applyInfoVO.setOrgValue(vo.getOrgFreight().toString() + currencyRespDTOMap.get(vo.getFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getFreightVolume().intValue()).getTitleZh());
applyInfoVO.setOrgValue(vo.getOrgFreight().toString() + currencyRespDTOMap.get(vo.getOrgFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getFreightVolume().intValue()).getTitleZh());
applyInfoVO.setNewValue(vo.getFreight().toString() + currencyRespDTOMap.get(vo.getFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getFreightVolume().intValue()).getTitleZh());
applyInfoVOList.add(applyInfoVO);
if (vo.getCharging() == 0) {
if (vo.getOrgCharging() == 0 || vo.getCharging() == 0) {
applyInfoVO = new ApplyInfoVO();
applyInfoVO.setName(vo.getProdTitleZh() + "清关费管理折扣");
applyInfoVO.setOrgValue(vo.getOrgClearanceFreight().toString() + currencyRespDTOMap.get(vo.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getClearanceFreightVolume().intValue()).getTitleZh());
......@@ -5496,7 +5532,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (vo.getCharging() == 0) {
applyInfoVO.setNewValue(vo.getClearanceFreight().toString() + currencyRespDTOMap.get(vo.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getClearanceFreightVolume().intValue()).getTitleZh());
}else {
//
// 当付费模式修改为全包价时，确保清关费设置为0
vo.setClearanceFreight(BigDecimal.ZERO);
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