|
|
@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; |
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.qniao.dam.api.command.order.user.request.UserCalculateSiteActivityOrderDto; |
|
|
import com.qniao.dam.api.command.order.user.request.UserCalculateSiteActivityOrderDto; |
|
|
import com.qniao.dam.api.command.order.user.request.UserSubmitSiteActivityOrderDto; |
|
|
import com.qniao.dam.api.command.order.user.request.UserSubmitSiteActivityOrderDto; |
|
|
|
|
|
import com.qniao.dam.api.command.order.user.response.UserCalculateMatchmakerOrderFeeVo; |
|
|
import com.qniao.dam.api.command.order.user.response.UserCalculateOrderFeeVo; |
|
|
import com.qniao.dam.api.command.order.user.response.UserCalculateOrderFeeVo; |
|
|
import com.qniao.dam.api.command.order.user.response.UserSubmitOrderVo; |
|
|
import com.qniao.dam.api.command.order.user.response.UserSubmitOrderVo; |
|
|
import com.qniao.dam.application.service.product.ProductApplicationService; |
|
|
import com.qniao.dam.application.service.product.ProductApplicationService; |
|
|
@ -508,4 +509,13 @@ public class OrderApplicationService extends BaseApplicationService { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public UserCalculateMatchmakerOrderFeeVo calculateMatchmakerOrderFee(Order order, |
|
|
|
|
|
MatchmakerOrderTypeEnum matchmakerOrderType) { |
|
|
|
|
|
//1. 填充订单信息 + 同类型权益,不同规格,限制购买和提醒 |
|
|
|
|
|
fillOrderInfo(order); |
|
|
|
|
|
//2. 订单金额计算 |
|
|
|
|
|
countMatchMakerOrderAmount(order, matchmakerOrderType); |
|
|
|
|
|
return new UserCalculateMatchmakerOrderFeeVo(order.getOriginalAmount(), order.getDiscountAmount(), order.getSettlementAmount()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |