|
|
|
@ -47,10 +47,12 @@ import com.qniao.dam.query.order.OrderQueryService; |
|
|
|
import com.qniao.dam.query.product.ProductQueryService; |
|
|
|
import com.qniao.dam.query.rewardconfig.RewardConfigQueryService; |
|
|
|
import com.qniao.dam.query.right.RightQueryService; |
|
|
|
import com.qniao.dam.query.usermarriageinformation.UserMarriageInformationQueryService; |
|
|
|
import com.qniao.das.application.DatingAgencyServiceApplicationService; |
|
|
|
import com.qniao.das.application.request.CalculateSiteActivityFeeDto; |
|
|
|
import com.qniao.das.application.response.CalculateSiteActivityFeeVo; |
|
|
|
import com.qniao.das.domian.aggregate.marriageinformation.MarriageInformation; |
|
|
|
import com.qniao.das.domian.aggregate.marriageinformation.UserMarriageInformation; |
|
|
|
import com.qniao.das.domian.aggregate.matchmakermarriage.MatchmakerMarriageInformation; |
|
|
|
import com.qniao.das.domian.aggregate.siteactivity.SiteActivity; |
|
|
|
import com.qniao.das.domian.aggregate.vip.VIPEnum; |
|
|
|
@ -116,6 +118,9 @@ public class OrderApplicationService extends BaseApplicationService { |
|
|
|
private OrderAggregate orderAggregate; |
|
|
|
@Resource |
|
|
|
private OrderDiscountConfigQueryService orderDiscountConfigQueryService; |
|
|
|
@Resource |
|
|
|
private UserMarriageInformationQueryService userMarriageInformationQueryService; |
|
|
|
|
|
|
|
|
|
|
|
@Value("${default_marriage_bounty_matchmaker_id}") |
|
|
|
private Long defaultMarriageBountyMatchmakerId; |
|
|
|
@ -198,6 +203,12 @@ public class OrderApplicationService extends BaseApplicationService { |
|
|
|
} |
|
|
|
} |
|
|
|
if (OrderBelongingEnum.CUSTOMER.equals(order.getOrderBelonging())) { |
|
|
|
if (Objects.isNull(order.getMiId())) { |
|
|
|
UserMarriageInformation userMarriageInformation = userMarriageInformationQueryService.queryByOwn(order.getUserId()); |
|
|
|
if (Objects.nonNull(userMarriageInformation)) { |
|
|
|
order.setMiId(userMarriageInformation.getMiId()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (Objects.nonNull(order.getMiId())) { |
|
|
|
MarriageInformation marriageInformation = marriageInformationDao.selectById(order.getMiId()); |
|
|
|
order.setOrderBelongName(marriageInformation.getNickName()); |
|
|
|
|