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 b7b878f..d45abf4 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 @@ -25,6 +25,7 @@ import com.qniao.dam.domain.aggregate.productspec.repository.ProductSpecReposito import com.qniao.dam.domain.aggregate.rewardconfig.entity.RewardConfig; import com.qniao.dam.domain.service.order.SubmitOrderDomainService; import com.qniao.dam.domain.service.order.SubmitSiteActivityOrderDomainService; +import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceTypeEnum; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderPaymentStatusEnum; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderStatusEnum; import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderVersion; @@ -129,7 +130,6 @@ public class OrderApplicationService extends BaseApplicationService { @Resource private EntrustServiceOrderQueryService entrustServiceOrderQueryService; - @Value("${default_marriage_bounty_matchmaker_id}") private Long defaultMarriageBountyMatchmakerId; @@ -293,6 +293,8 @@ public class OrderApplicationService extends BaseApplicationService { entrustServiceOrderQueryService.checkEntrustServiceOrder(entrustServiceOrder); //2.查询委托服务价格 BigDecimal amount = queryEntrustServiceAmount(entrustServiceOrder); + //3.组装产品信息 + Product product = productApplicationService.handleEntrustServiceProduct(entrustServiceOrder, amount); return null; } @@ -300,7 +302,13 @@ public class OrderApplicationService extends BaseApplicationService { * 查询委托服务价格 */ private BigDecimal queryEntrustServiceAmount(EntrustServiceOrder entrustServiceOrder) { - + RewardConfig rewardConfig; + if (EntrustServiceTypeEnum.CONTACT_INFO_EXCHANGE.equals(entrustServiceOrder.getType())) { + rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.ENTRUST_SERVICE_CONTACT_INFO_EXCHANGE_FEE); + } else { + rewardConfig = rewardConfigQueryService.queryByRewardType(RewardTypeEnum.ENTRUST_SERVICE_OFFLINE_MEETING_FEE); + } + return new BigDecimal(rewardConfig.getValue()); } /** diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/product/ProductApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/product/ProductApplicationService.java index 4eef8b5..e357063 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/product/ProductApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/product/ProductApplicationService.java @@ -1,12 +1,14 @@ package com.qniao.dam.application.service.product; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder; import com.qniao.dam.domain.aggregate.product.ProductAggregate; import com.qniao.dam.domain.aggregate.product.entity.Product; import com.qniao.dam.domain.aggregate.product.repository.ProductRepository; import com.qniao.dam.domain.aggregate.productspec.entity.ProductSpec; import com.qniao.dam.domain.service.product.CreateProductDomainService; import com.qniao.dam.domain.service.product.EditProductDomainService; +import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceTypeEnum; import com.qniao.dam.domian.aggregate.product.constant.ProductStatusEnum; import com.qniao.dam.infrastructure.persistent.dao.activity.ActivityDao; import com.qniao.dam.infrastructure.persistent.dao.domain.ProductDao; @@ -14,6 +16,7 @@ import com.qniao.framework.exception.BizException; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.List; @Service @@ -56,4 +59,16 @@ public class ProductApplicationService { // } productAggregate.operate(product); } + + /** + * 组装委托服务产品 + */ + public Product handleEntrustServiceProduct(EntrustServiceOrder entrustServiceOrder, + BigDecimal amount) { + if(EntrustServiceTypeEnum.CONTACT_INFO_EXCHANGE.equals(entrustServiceOrder.getType())){ + + }else{ + + } + } }