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

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

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