|
@@ -135,9 +135,11 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
|
|
|
// bean.setProductName(productLineDTO.getName());
|
|
|
// }
|
|
|
// }
|
|
|
- for (OpenedProducts openedProducts:opendList) {
|
|
|
- if(openedProducts.getUserId().longValue() == bean.getUserId().longValue()&&openedProducts.getProductId().longValue() == bean.getProductId().longValue()){
|
|
|
- bean.setEndTime(openedProducts.getEndTime());
|
|
|
+ if(bean.getRenewalsStatus().intValue() == RenewalsEnum.NOT_RENEWALS.getKey()){
|
|
|
+ for (OpenedProducts openedProducts:opendList) {
|
|
|
+ if(openedProducts.getUserId().longValue() == bean.getUserId().longValue()&&openedProducts.getProductId().longValue() == bean.getProductId().longValue()){
|
|
|
+ bean.setEndTime(openedProducts.getEndTime());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (null != productMap && null != productMap.get(bean.getProductId())){
|