|
@@ -252,7 +252,8 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
|
|
|
|
|
|
for (ActivityPlanRewardDto activityPlanRewardDto : activityPlan.getActivityRewardList()) {
|
|
|
for (MemberPriceSettingsVo memberPriceSettingsVo : memberPriceSettingsVos) {
|
|
|
- if (memberPriceSettingsVo.getPeriod().getCode().equals( activityPlanRewardDto.getActivityReward().getUnit().getCode())) {
|
|
|
+ if (activityPlanRewardDto.getActivityReward().getRewardType().getCode().equals(memberPriceSettingsVo.getVipType().getCode())
|
|
|
+ && activityPlanRewardDto.getActivityReward().getUnit().getCode().equals(memberPriceSettingsVo.getPeriod().getCode())) {
|
|
|
memberPriceSettingsVo.setDiscount(YesOrNoEnum.YES);
|
|
|
memberPriceSettingsVo.setDiscountPrice(activityPlanRewardDto.getActivityReward().getDiscountPrice());
|
|
|
}
|