From 37e813869b233af5acc8af971a2f336b9bbafd7b Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Thu, 6 Jun 2024 14:57:28 +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

---
 .../order/user/response/UserCalculateOrderFeeVo.java      | 7 +++++++
 .../service/order/OrderApplicationService.java            | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/response/UserCalculateOrderFeeVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/response/UserCalculateOrderFeeVo.java
index afb8ac8..2218e5f 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/response/UserCalculateOrderFeeVo.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/response/UserCalculateOrderFeeVo.java
@@ -1,5 +1,6 @@
 package com.qniao.dam.api.command.order.user.response;
 
+import com.qniao.das.application.response.CalculateSiteActivityFeeVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,4 +24,10 @@ public class UserCalculateOrderFeeVo {
 
     @ApiModelProperty("结算单价")
     private BigDecimal unitSettlementPrice;
+
+    @ApiModelProperty("当前vip状态")
+    private Boolean vipStatus;
+
+    @ApiModelProperty("vip费用")
+    private CalculateSiteActivityFeeVo vipFee;
 }
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 ac58d9d..ac896c9 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
@@ -47,6 +47,7 @@ import com.qniao.dau.domain.aggregate.matchmaker.entity.Matchmaker;
 import com.qniao.domain.BaseApplicationService;
 import com.qniao.domain.BaseDomainEvent;
 import com.qniao.framework.exception.BizException;
+import com.qniao.framework.utils.TypeConvertUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -333,7 +334,10 @@ public class OrderApplicationService extends BaseApplicationService {
         if (calculateVo.getUnitOriginalPrice().compareTo(BigDecimal.ZERO) <= 0) {
             throw new BizException("下单异常");
         }
-        return new UserCalculateOrderFeeVo(calculateVo.getUnitOriginalPrice(), calculateVo.getDiscountAmount(),
-                calculateVo.getAssistanceFee(), calculateVo.getUnitSettlementPrice());
+        return TypeConvertUtils.convert(calculateVo, UserCalculateOrderFeeVo.class, (a, b) -> {
+            if (Objects.nonNull(a.getVipFee())) {
+                b.setVipFee(TypeConvertUtils.convert(a.getVipFee(), CalculateSiteActivityFeeVo.class));
+            }
+        });
     }
 }