|
@@ -495,13 +495,15 @@ public class MemberServiceImpl implements MemberService {
|
|
|
|
|
|
Date now = new Date();
|
|
|
for (SubSetPricing setPricing : subSetPricingList) {
|
|
|
- Date startDate = setPricing.getStartDate();
|
|
|
- Date endDate = setPricing.getEndDate();
|
|
|
- if (endDate.getTime() - now.getTime() > 0) {
|
|
|
- if (startDate.getTime() - now.getTime() < 0) {
|
|
|
- num += endDate.getTime() - now.getTime();
|
|
|
- } else {
|
|
|
- num += endDate.getTime() - startDate.getTime();
|
|
|
+ if(!"1".equals(setPricing.getTargetId())) {
|
|
|
+ Date startDate = setPricing.getStartDate();
|
|
|
+ Date endDate = setPricing.getEndDate();
|
|
|
+ if (endDate.getTime() - now.getTime() > 0) {
|
|
|
+ if (startDate.getTime() - now.getTime() < 0) {
|
|
|
+ num += endDate.getTime() - now.getTime();
|
|
|
+ } else {
|
|
|
+ num += endDate.getTime() - startDate.getTime();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|