Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -207,6 +207,21 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
          if(user==null){
            	 return RespDTO.onError("该用户已不存在"); 
             }
+     	UserRenewals userRenewals = new UserRenewals();
+     	userRenewals.setUserId(startAndendByUserIdVO.getUserId());
+     	int userSum = userRenewalsFacade.getUserWaitingRenewal(userRenewals);
+     	if(userSum>0){
+      		 return RespDTO.onError("该产品无法停用，请先处理续费申请信息");
+         	}
+     	Map<String, Object> map = new HashMap<String, Object>();
+        map.put("userId", startAndendByUserIdVO.getUserId());
+        map.put("productId", startAndendByUserIdVO.getProductId());
+        List<OpenedProducts> OpenedProductsData = selectOpenedProducts(map);
+        if(OpenedProductsData != null){
+        	 if(OpenedProductsData.contains(startAndendByUserIdVO.getServiceStatus())){
+             	return RespDTO.onError("该产品已被"+StatusEnum.getName(startAndendByUserIdVO.getServiceStatus())+"无需先处理");
+             };	
+        }
         boolean res = startAndendByuserId(openedProducts);
         if (!res) {
             throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -967,9 +967,9 @@ public class UserFacade extends UserServiceImpl {
                     "获取用户续费数量信息失败");
         }
         int renewalSum = renewalSums.data;
-        System.out.println("========renewalSu====="+renewalSum);
+        //System.out.println("========renewalSu====="+renewalSum);
         if(renewalSum>0){
-   		 return RespDTO.onError("该用户续费申请单，请先审核");
+   		 return RespDTO.onError("该用户存在续费申请单，请先审核");
       	}
         //查询用户是否有待审核的产品数量
         RespDTO<Integer> auditSums = diagbotmanClient.getOrderByUserToAudit(baseIdVO.getId());
@@ -978,7 +978,7 @@ public class UserFacade extends UserServiceImpl {
                     "审核的产品数量失败");
         }
         int auditSum = auditSums.data;
-        System.out.println("=========auditSumauditSum===="+auditSum);
+        //System.out.println("=========auditSumauditSum===="+auditSum);
         if(auditSum>0){
    		 return RespDTO.onError("该用户产品申请单，请先审核");
     	}