From 5d2463c82b24417b228bbeefff988402621963a9 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Fri, 14 Jun 2024 10:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/order/OrderApplicationService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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));
             }
         });