diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java index a46d8b7..b108bb0 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java @@ -11,6 +11,7 @@ import com.qniao.dam.domain.aggregate.productspec.entity.ProductSpec; import com.qniao.dam.domain.aggregate.rewardconfig.entity.RewardConfig; 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; import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; import com.qniao.dam.domian.aggregate.rewardconfig.constant.RewardTypeEnum; import com.qniao.dam.infrastructure.persistent.dao.domain.MarriageBountyOrderDao; @@ -116,22 +117,28 @@ public class MarriageBountyOrderQueryServiceImpl implements MarriageBountyOrderQ productInfoVo.setType(marriageBountyOrder.getType()); productInfoVo.setRewardAmount(marriageBountyOrder.getRewardAmount()); productInfoVo.setMeetingQuantity(marriageBountyOrder.getMeetingQuantity()); - int usedMeetingQuantity = 0; - int usableMeetingQuantity = 0; - for (MarriageBountyOrderReward orderReward : marriageBountyOrder.getOrderRewardList()) { - if (ProductSubCategoryEnum.MARRIAGE_BOUNTY_MEETING_FEE.equals(orderReward.getRewardCategory())) { - productInfoVo.setMeetingFee(orderReward.getRewardAmount()); - if (orderReward.getIsReceive()) { - usedMeetingQuantity++; - } else { - usableMeetingQuantity++; + if(MarriageBountyOrderVersion.V1.equals(marriageBountyOrder.getVersion())) { + int usedMeetingQuantity = 0; + int usableMeetingQuantity = 0; + for (MarriageBountyOrderReward orderReward : marriageBountyOrder.getOrderRewardList()) { + if (ProductSubCategoryEnum.MARRIAGE_BOUNTY_MEETING_FEE.equals(orderReward.getRewardCategory())) { + productInfoVo.setMeetingFee(orderReward.getRewardAmount()); + if (orderReward.getIsReceive()) { + usedMeetingQuantity++; + } else { + usableMeetingQuantity++; + } + } else if (ProductSubCategoryEnum.MARRIAGE_BOUNTY_RESULT_GIFT.equals(orderReward.getRewardCategory())) { + productInfoVo.setResultGift(orderReward.getRewardAmount()); } - } else if (ProductSubCategoryEnum.MARRIAGE_BOUNTY_RESULT_GIFT.equals(orderReward.getRewardCategory())) { - productInfoVo.setResultGift(orderReward.getRewardAmount()); } + productInfoVo.setUsedMeetingQuantity(usedMeetingQuantity); + productInfoVo.setUsableMeetingQuantity(usableMeetingQuantity); + }else { + //新版本,不限制推荐人数 可用见面次数>0 即可 + productInfoVo.setUsedMeetingQuantity(0); + productInfoVo.setUsableMeetingQuantity(999); } - productInfoVo.setUsedMeetingQuantity(usedMeetingQuantity); - productInfoVo.setUsableMeetingQuantity(usableMeetingQuantity); } return productInfoVo; }