|
|
|
@ -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()); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|