更多服务开通产品判断

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

@@ -22,6 +22,7 @@ import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.AuthStatusEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.NotPassEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -174,9 +175,13 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         }
         for (int i =0; i<addOrderVO.getProductId().size();i++){
             for(int l = 0; l< productList.size(); l++){
-                if(addOrderVO.getProductId().get(l).intValue() == productList.get(l).getId().intValue() && productList.get(l).getIsDeleted().equals(IsDeleteEnum.Y.getKey())){
+                if(addOrderVO.getProductId().get(i).intValue() == productList.get(l).getId().intValue() && productList.get(l).getIsDeleted().equals(IsDeleteEnum.Y.getKey())){
                         throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                                "【"+productList.get(l).getName()+"】产品已删除,请刷新重试");
+                                "【"+productList.get(l).getName()+"】已删除,请刷新重试");
+                }
+                if(addOrderVO.getProductId().get(i).intValue() == productList.get(l).getId().intValue() && productList.get(l).getServiceStatus().intValue() == StatusEnum.Disable.getKey()){
+                    throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                            "【"+productList.get(l).getName()+"】已停用,请刷新重试");
                 }
             }
             for (int j =0; j<opendId.size();j++){

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

@@ -15,6 +15,7 @@ import com.diagbot.entity.wrapper.UserRenewalsWrapper;
 import com.diagbot.enums.CancelRenewalsEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.RenewalsEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -65,7 +66,11 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         LantoneProduct lantoneProduct = lantoneProductFacade.getById(addRenewalsInfoVO.getProductId());
         if(lantoneProduct.getIsDeleted().equals(IsDeleteEnum.Y.getKey())){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "该产品已删除,请刷新页面");
+                    "【"+lantoneProduct.getName()+"】已删除,请刷新页面");
+        }
+        if(lantoneProduct.getServiceStatus().intValue() == StatusEnum.Disable.getKey()){
+            throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                    "【"+lantoneProduct.getName()+"】已停用,请刷新页面");
         }
         UserRenewals userRenewals =new UserRenewals();
         Map map =new HashMap();