|
@@ -49,19 +49,14 @@ public class ActivityDTO {
|
|
|
dto.setMaxParticipants(activity.getMaxParticipants());
|
|
dto.setMaxParticipants(activity.getMaxParticipants());
|
|
|
dto.setCurrentParticipants(activity.getCurrentParticipants());
|
|
dto.setCurrentParticipants(activity.getCurrentParticipants());
|
|
|
dto.setVendorName(activity.getVendorName());
|
|
dto.setVendorName(activity.getVendorName());
|
|
|
- // Guest-aware price
|
|
|
|
|
- if (isGuest) {
|
|
|
|
|
- dto.setPrice(null);
|
|
|
|
|
- dto.setPriceLabel("登录查看价格");
|
|
|
|
|
|
|
+ // Member-aware pricing: resolve final display price based on membership level
|
|
|
|
|
+ // Guests (no memberLevel) see base price; members see memberPrice if applicable
|
|
|
|
|
+ Integer resolvedPrice = resolveMemberPrice(activity.getPrice(), activity.getMemberPrice(), memberLevel);
|
|
|
|
|
+ dto.setPrice(resolvedPrice);
|
|
|
|
|
+ if (resolvedPrice != null && resolvedPrice == 0) {
|
|
|
|
|
+ dto.setPriceLabel("免费");
|
|
|
} else {
|
|
} else {
|
|
|
- // Member-aware pricing: resolve final price based on membership level
|
|
|
|
|
- Integer resolvedPrice = resolveMemberPrice(activity.getPrice(), activity.getMemberPrice(), memberLevel);
|
|
|
|
|
- dto.setPrice(resolvedPrice);
|
|
|
|
|
- if (resolvedPrice != null && resolvedPrice == 0) {
|
|
|
|
|
- dto.setPriceLabel("免费");
|
|
|
|
|
- } else {
|
|
|
|
|
- dto.setPriceLabel(null);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ dto.setPriceLabel(null);
|
|
|
}
|
|
}
|
|
|
return dto;
|
|
return dto;
|
|
|
}
|
|
}
|