|
@@ -36,6 +36,8 @@ import utils.RedisUtils;
|
|
|
import utils.SMSUtils;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
|
|
|
@Slf4j
|
|
@@ -495,23 +497,26 @@ public class MemberServiceImpl implements MemberService {
|
|
|
*/
|
|
|
public long getLeftDay(List<SubSetPricing> subSetPricingList) {
|
|
|
long day = 0;
|
|
|
- long num = 0;
|
|
|
|
|
|
Date now = new Date();
|
|
|
+ BigDecimal normal = new BigDecimal(86400000);
|
|
|
for (SubSetPricing setPricing : subSetPricingList) {
|
|
|
if(1 != 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();
|
|
|
+ long l = endDate.getTime() - now.getTime();
|
|
|
+ BigDecimal b1 = new BigDecimal(l);
|
|
|
+ day += b1.divide(normal,0,RoundingMode.UP).longValue();
|
|
|
} else {
|
|
|
- num += endDate.getTime() - startDate.getTime();
|
|
|
+ long l = endDate.getTime() - startDate.getTime();
|
|
|
+ BigDecimal b1 = new BigDecimal(l);
|
|
|
+ day += b1.divide(normal,0,RoundingMode.UP).longValue();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- day = num / 24 / 60 / 60 / 1000;//除以一天的毫秒数
|
|
|
return day;
|
|
|
}
|
|
|
|