Commit 9f8f9f77 authored by 332784038@qq.com's avatar 332784038@qq.com Committed by wux

特价申请的在全包价的情况下不校验清关费的参数

parent ad6656ea
......@@ -5259,6 +5259,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (specialApplyVO.getFreight().compareTo(specialApplyVO.getOrgFreight()) == 0 && Objects.equals(specialApplyVO.getFreightCurrency(), specialApplyVO.getOrgFreightCurrency())) {
throw exception(SPECIAL_APPLY_DISCOUNT_FREIGHT_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
}
if (specialApplyVO.getCharging() == 0) {
if (Objects.isNull(specialApplyVO.getClearanceFreight()) || specialApplyVO.getClearanceFreight().compareTo(BigDecimal.ZERO) <= 0) {
throw exception(FINAL_SALE_CLEARANCE_AMOUNT_MUST_GT_ZERO);
}
......@@ -5266,6 +5267,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
throw exception(SPECIAL_APPLY_DISCOUNT_CLEARANCE_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
}
}
}
if (specialApplyVO.getApplyType() == 3) {
......@@ -5553,6 +5555,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (vo.getFreight().compareTo(vo.getOrgFreight()) == 0 && Objects.equals(vo.getFreightCurrency(), vo.getOrgFreightCurrency())) {
throw exception(SPECIAL_APPLY_DISCOUNT_FREIGHT_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
}
if (vo.getCharging() == 0) {
if (Objects.isNull(vo.getClearanceFreight()) || vo.getClearanceFreight().compareTo(BigDecimal.ZERO) <= 0) {
throw exception(FINAL_SALE_CLEARANCE_AMOUNT_MUST_GT_ZERO);
}
......@@ -5560,6 +5563,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
throw exception(SPECIAL_APPLY_DISCOUNT_CLEARANCE_NEW_AMOUNT_NOT_EQ_ORG_AMOUNT);
}
}
}
orderItemDOList.add(orderItemDO);
}
}
......
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