产品停用判断

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -17,6 +17,7 @@ import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserRenewals;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.entity.wrapper.ServiceInfoWrapper;
 import com.diagbot.entity.wrapper.UserRenewalsWrapper;
@@ -174,7 +175,10 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             renewalsInfosDTO.setProductId(updateProductVO.getId());
             renewalsInfosDTO.setRenewalsStatus(RenewalsEnum.NOT_RENEWALS.getKey());
             List<RenewalsInfosDTO> list =  userRenewalsFacade.selectUserRenewals(page,renewalsInfosDTO).getRecords();
-            if(list.contains(RenewalsEnum.NOT_RENEWALS.getKey()) && list.contains(CancelRenewalsEnum.NOT_CANCEL.getKey())){
+            UserRenewals userRenewals = new UserRenewals();
+            userRenewals.setRenewalsStatus(RenewalsEnum.NOT_RENEWALS.getKey());
+            userRenewals.setCancelRenewals(CancelRenewalsEnum.NOT_CANCEL.getKey());
+            if(list.contains(userRenewals)){
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         "该产品无法停用，请先处理续费申请信息");
             }