|
|
|
@ -427,13 +427,13 @@ public class OrderApplicationService extends BaseApplicationService { |
|
|
|
// fillOrderInfo(order); |
|
|
|
// } else { |
|
|
|
//是否vip |
|
|
|
boolean vip = rightQueryService.checkUserVipRight(userId, dto.getMiId()).getVip(); |
|
|
|
//boolean vip = rightQueryService.checkUserVipRight(userId, dto.getMiId()).getVip(); |
|
|
|
//报名参加活动 |
|
|
|
order = Order.build(userId, dto.getMiId(), OrderBelongingEnum.CUSTOMER, marriageInformation.getNickName(), OrderTypeEnum.NORMAL); |
|
|
|
ProductSpec productSpec = product.getProductSpecList().get(0); |
|
|
|
//todo feign 获取活动应付金额 |
|
|
|
CalculateSiteActivityFeeDto calculateDto = new CalculateSiteActivityFeeDto(dto.getSiteActivityId(), userId, |
|
|
|
dto.getMiId(), vip ? VIPEnum.YES.getValue() : VIPEnum.NO.getValue()); |
|
|
|
dto.getMiId()); |
|
|
|
CalculateSiteActivityFeeVo calculateVo = datingAgencyServiceApplicationService.calculateSiteActivityFeeBySdk(calculateDto); |
|
|
|
if (!calculateVo.getEnable()) { |
|
|
|
throw new BizException("下单异常"); |
|
|
|
@ -455,9 +455,9 @@ public class OrderApplicationService extends BaseApplicationService { |
|
|
|
|
|
|
|
public UserCalculateOrderFeeVo calculateSiteActivityOrderFee(UserCalculateSiteActivityOrderDto dto, Long userId) { |
|
|
|
//是否vip |
|
|
|
boolean vip = rightQueryService.checkUserVipRight(userId, dto.getMiId()).getVip(); |
|
|
|
//boolean vip = rightQueryService.checkUserVipRight(userId, dto.getMiId()).getVip(); |
|
|
|
CalculateSiteActivityFeeDto calculateDto = new CalculateSiteActivityFeeDto(dto.getSiteActivityId(), userId, |
|
|
|
dto.getMiId(), vip ? VIPEnum.YES.getValue() : VIPEnum.NO.getValue()); |
|
|
|
dto.getMiId()); |
|
|
|
CalculateSiteActivityFeeVo calculateVo = datingAgencyServiceApplicationService.calculateSiteActivityFeeBySdk(calculateDto); |
|
|
|
if (!calculateVo.getEnable()) { |
|
|
|
throw new BizException("下单异常"); |
|
|
|
|