diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java index ac896c9..f38f44f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java @@ -331,11 +331,11 @@ public class OrderApplicationService extends BaseApplicationService { CalculateSiteActivityFeeDto calculateDto = new CalculateSiteActivityFeeDto(dto.getSiteActivityId(), userId, dto.getMiId(), vip ? VIPEnum.YES.getValue() : VIPEnum.NO.getValue()); CalculateSiteActivityFeeVo calculateVo = datingAgencyServiceApplicationService.calculateSiteActivityFeeBySdk(calculateDto); - if (calculateVo.getUnitOriginalPrice().compareTo(BigDecimal.ZERO) <= 0) { + if (!calculateVo.getEnable()) { throw new BizException("下单异常"); } return TypeConvertUtils.convert(calculateVo, UserCalculateOrderFeeVo.class, (a, b) -> { - if (Objects.nonNull(a.getVipFee())) { + if (Objects.nonNull(a.getVipFee()) && a.getVipFee().getEnable()) { b.setVipFee(TypeConvertUtils.convert(a.getVipFee(), CalculateSiteActivityFeeVo.class)); } });