|
@@ -47,7 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -267,16 +266,9 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
|
|
|
}
|
|
|
|
|
|
// 产品是否在有效期内 该产品未在有效服务期内,无法使用
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
- Date current = new Date();
|
|
|
- calendar.setTime(current);
|
|
|
- Calendar endCalendar = Calendar.getInstance();
|
|
|
- Calendar startCalendar = Calendar.getInstance();
|
|
|
- startCalendar.setTime(product.getStartTime());
|
|
|
- endCalendar.setTime(product.getEndTime());
|
|
|
- if (calendar.after(endCalendar)) {
|
|
|
+ if (product.getEndTime().before(new Date())) {
|
|
|
product.setIsExpired(true);
|
|
|
- } else if (calendar.before(startCalendar)) {
|
|
|
+ } else if (product.getStartTime().after(new Date())) {
|
|
|
product.setUnStarted(true);
|
|
|
}
|
|
|
|