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

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

@@ -207,20 +207,33 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
          if(user==null){
            	 return RespDTO.onError("该用户已不存在"); 
             }
+         //当用户是操作是启用的时候，先判断该产品是否是启用状态
+		if (startAndendByUserIdVO.getServiceStatus().equals(StatusEnum.Enable.getKey())) {
+			LantoneProduct lantoneProduct = new LantoneProduct();
+			lantoneProduct.setId(startAndendByUserIdVO.getProductId());
+			LantoneProduct lantone = lantoneProductFacade.getById(lantoneProduct);
+			if (lantone.getServiceStatus().equals(StatusEnum.Disable.getKey())) {
+				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())+"无需先处理");
-             };	
+        	for(OpenedProducts openedProductsNew : OpenedProductsData){
+        		if(openedProductsNew.getServiceStatus().equals(startAndendByUserIdVO.getServiceStatus())){
+        			return RespDTO.onError("该产品已被"+StatusEnum.getName(startAndendByUserIdVO.getServiceStatus())+"无需先处理");	
+        		}
+        	}	
         }
         boolean res = startAndendByuserId(openedProducts);
         if (!res) {

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

@@ -192,12 +192,4 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         }
         return true;
     }
-    /**
-     *查詢用户的待续费数量
-     * @param userRenewals
-     * @return
-     */
-    public int getUserWaitingRenewal(UserRenewals userRenewals){
-    	return this.getUserWaitingRenewal(userRenewals);
-    }
 }

diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -120,7 +120,7 @@
 		FROM
 		diag_opened_products
 		WHERE
-		user_id = #{userId} and is_deleted = 'N' and service_status = 1)
+		user_id = #{userId} and is_deleted = 'N')
 	</select>
 
     <select id="getConsoleOnTrialCount" parameterType="long" resultType="int">