Merge branch 'dev/one' into dev/intelligentTriage

diagbotman-service/src/main/java/com/diagbot/dto/OpenProductCheckDTO.java

@@ -0,0 +1,22 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 开通产品状态校验返回类
+ * @Author: rgb
+ * @Date: 2018/11/8 14:10
+ */
+
+@Getter
+@Setter
+public class OpenProductCheckDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Boolean hasPermission ;//标志
+    private String userId;         //用户ID
+}

diagbotman-service/src/main/java/com/diagbot/dto/ProductLineDTO.java

@@ -24,6 +24,12 @@ public class ProductLineDTO {
      * 产品名称
      */
     private String name;
+
+    /**
+     * 是否删除 N:未删除，Y:删除
+     */
+    private String isDeleted;
+
     /**
      * 产品介绍
      */

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

@@ -111,7 +111,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         LantoneProduct lantoneProduct = this.getById(updateProductVO.getId());
         if(lantoneProduct.getIsDeleted().equals(IsDeleteEnum.Y.getKey())){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "该产品已删除");
+                    "该产品已删除,请刷新页面");
         }
         BeanUtil.copyProperties(updateProductVO, lantoneProduct);
         lantoneProduct.setModifier(UserUtils.getCurrentPrincipleID());
@@ -143,7 +143,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         LantoneProduct lantoneProduct = this.getById(updateProductVO.getId());
         if(lantoneProduct.getIsDeleted().equals(IsDeleteEnum.Y.getKey())){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "该产品已删除");
+                    "该产品已删除,请刷新页面");
         }
         if(updateProductVO.getServiceStatus() == lantoneProduct.getServiceStatus() && updateProductVO.getServiceStatus() == StatusEnum.Enable.getKey()){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -201,7 +201,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         LantoneProduct lantoneProduct = this.getById(updateProductVO.getId());
         if(lantoneProduct.getIsDeleted().equals(IsDeleteEnum.Y.getKey())){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "该产品已删除");
+                    "该产品已删除,请刷新页面");
         }
         if(lantoneProduct.getServiceStatus()==StatusEnum.Enable.getKey()){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -345,7 +345,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         LantoneProduct lantoneProducts = this.getById(lantoneProduct.getId());
         if(lantoneProducts.getIsDeleted().equals(IsDeleteEnum.Y.getKey())){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "该产品已删除");
+                    "该产品已删除,请刷新页面");
         }
         Page page =new Page();
         BeanUtil.copyProperties(oppendedProductVO,page);

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

@@ -1,13 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
@@ -38,6 +30,13 @@ import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
 import com.diagbot.vo.ProductServiceSaveVO;
 import com.diagbot.vo.StartAndendByUserIdVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:已开通产品业务层
@@ -311,6 +310,11 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         map.put("productId",modifyOpeningTimeVO.getProductId());
         List<OpenedProducts> opendList = openedProductsFacade.selectOpenedProducts(map);
         List<Long> renewalsList = userRenewalsFacade.selectProductIdByUserId(map);
+        for (OpenedProducts opened:opendList) {
+            if(opened.getServiceStatus().intValue() == StatusEnum.Disable.getKey()){
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "用户产品已停用，请刷新页面");
+            }
+        }
         if(!renewalsList.contains(modifyOpeningTimeVO.getProductId())){
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "续费单已审核,请刷新重试");
         }

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

@@ -1,25 +1,45 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.AuthDetailDTO;
+import com.diagbot.dto.HasPermissionDTO;
 import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
+import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.dto.ProductOrderExportDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.dto.WaitExamOrderCouDTO;
+import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
 import com.diagbot.entity.User;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
+import com.diagbot.entity.wrapper.ServiceTokenWrapper;
 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.TokenTypeEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -30,21 +50,13 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ExportBeanExcelUtil;
 import com.diagbot.util.GsonUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddOrderVO;
+import com.diagbot.vo.OpenProductCheckVO;
 import com.diagbot.vo.OrderDetialsVO;
 import com.diagbot.vo.ProductOrderExportVO;
 import com.diagbot.vo.ProductOrderVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 订单业务
@@ -69,6 +81,8 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
     private ProductOrderFacade productOrderFacade;
     @Autowired
     private OpenedProductsFacade openedProductsFacade;
+    @Autowired
+    private ServiceTokenFacade serviceTokenFacade;
 
 
     /**
@@ -157,6 +171,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         List<Long> opendId = openedProductsFacade.getOpendCountByUserId(userId);
         List<Long> orderDetailsId = orderDetailsFacade.getOrderDetailsByUser(userId);
+        List<ProductLineDTO> productList = lantoneProductFacade.productLinesB();
         List<Long> userIdList =new ArrayList<>();
         userIdList.add(userId);
         RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(userIdList);
@@ -171,6 +186,16 @@ 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(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()+"】已删除,请刷新重试");
+                }
+                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++){
                 if(addOrderVO.getProductId().get(i)==opendId.get(j)){
                     throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请勿重复提交已开通产品");
@@ -245,6 +270,64 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         waitExamOrderCouDTO.setCount(baseMapper.waitExamOrderCou(userIds));
         return waitExamOrderCouDTO;
     }
+    
+    /**
+     * 已开通产品状态校验
+     *
+     * @param serviceTokenVo 参数
+     * @return 是否有权限
+     */
+    public RespDTO<HasPermissionDTO> hasPermission(OpenProductCheckVO serviceTokenVo) {
+        HasPermissionDTO hasPermissionDTO = new HasPermissionDTO();
+        String appkey = serviceTokenVo.getAppkey();
+        String secret = serviceTokenVo.getSecret();
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("appkey", appkey);
+        paramMap.put("secret", secret);
+        paramMap.put("productId", serviceTokenVo.getProductId());
+
+        //获取用户的id
+        List<ServiceTokenWrapper> serviceTokenWrapperList = serviceTokenFacade.getByAppkeyAndSecretAndProductId(paramMap);
+
+        if (ListUtil.isEmpty(serviceTokenWrapperList)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "appkey或secret错误，appkey=【" + appkey + "】," + "secret=【" + secret + "】");
+        }
+        ServiceTokenWrapper st = serviceTokenWrapperList.get(0);
+        if (StatusEnum.Disable.getKey() == st.getServiceStatus()) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该产品已停用");
+        }
+        if (TokenTypeEnum.Trial.getKey() == st.getType()) {
+            Date date = new Date();
+            if (st.getExpiringDate().getTime() < date.getTime()) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "访问权限已过期");
+            }
+        } else {
+            QueryWrapper<OpenedProducts> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+            queryWrapper.eq("user_id", st.getUserId());
+            queryWrapper.eq("product_id", st.getProductId());
+            OpenedProducts op = openedProductsFacade.getOne(queryWrapper);
+            if (op == null) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "无权限访问");
+            }
+            Date date = new Date();
+            if (!(StatusEnum.Enable.getKey() == op.getServiceStatus())) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "当前服务已停用");
+            }
+            if (op.getStartTime().getTime() > date.getTime()) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该产品未在有效服务期内，无法使用");
+            }
+            if (op.getEndTime().getTime() < date.getTime()) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该产品已超出有效服务期，无法使用");
+            }
+        }
+        hasPermissionDTO.setHasPermission(true);
+        //获取用户的id
+        if (st.getUserId() != null) {
+            hasPermissionDTO.setUserId(st.getUserId().toString());
+        }
+        return RespDTO.onSuc(hasPermissionDTO);
+    }
 
 
 	/**

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

@@ -12,6 +12,7 @@ import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.ServiceToken;
 import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ServiceTypeEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -23,6 +24,7 @@ import com.diagbot.util.GuidUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ProductServiceSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -197,13 +199,19 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         serviceTokenFacade.update(new ServiceToken(), tokenUpdateWrapper);
 
         //删除产品服务端关联
-        for (ProductService productService : productServiceList) {
-            productService.setIsDeleted(IsDeleteEnum.Y.getKey());
-        }
         UpdateWrapper<ProductService> productServiceUpdateWrapper = new UpdateWrapper<>();
         productServiceUpdateWrapper.in("id", map.keySet());
         productServiceUpdateWrapper.set("is_deleted", IsDeleteEnum.Y.getKey());
         this.update(new ProductService(), productServiceUpdateWrapper);
+
+        //删除系统自动生成的服务端
+        Map<Long, List<ProductService>> serviceMap = EntityUtil.makeEntityListMap(productServiceList, "serviceId");
+        UpdateWrapper<ServiceInfo> serviceInfoUpdateWrapper = new UpdateWrapper<>();
+        serviceInfoUpdateWrapper.in("id", serviceMap.keySet())
+                .eq("type", ServiceTypeEnum.Sys_Create.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey());
+        serviceInfoFacade.update(new ServiceInfo(), serviceInfoUpdateWrapper);
         return true;
     }
 

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.dto.RenewalsInfosDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserRenewals;
@@ -14,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;
@@ -61,6 +63,15 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
      * @return Boolean
      */
     public RespDTO<Boolean> addRenewalsInfos(AddRenewalsInfoVO addRenewalsInfoVO){
+        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();
         String user = UserUtils.getCurrentPrincipleID();
@@ -79,6 +90,11 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         if(this.selectProductIdByUserId(map).contains(addRenewalsInfoVO.getProductId())){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请勿重复提交申请");
         }
+        for (OpenedProducts openedProducts:openedProductsList) {
+            if(openedProducts.getServiceStatus().intValue() == StatusEnum.Disable.getKey()){
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "您的产品已停用，请刷新页面");
+            }
+        }
         userRenewals.setProductId(addRenewalsInfoVO.getProductId());
         return RespDTO.onSuc(this.save(userRenewals));
     }

diagbotman-service/src/main/java/com/diagbot/vo/OpenProductCheckVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: appkey 和 secret接收类
+ * @Author: rgb
+ * @Date: 2018/11/8 14:10
+ */
+@Getter
+@Setter
+public class OpenProductCheckVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String appkey;
+    private String secret;
+    private Long productId;
+}

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -1,10 +1,22 @@
 package com.diagbot.web;
 
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
+import com.diagbot.dto.OpenProductCheckDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
 import com.diagbot.dto.ProductOrderDTO;
@@ -20,22 +32,15 @@ import com.diagbot.facade.OrderDetailsFacade;
 import com.diagbot.facade.ProductOrderFacade;
 import com.diagbot.facade.UserRenewalsFacade;
 import com.diagbot.vo.ModifyOpeningTimeVO;
+import com.diagbot.vo.OpenProductCheckVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
 import com.diagbot.vo.ProductOrderVO;
 import com.diagbot.vo.StartAndendByUserIdVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.validation.Valid;
-import java.util.List;
-
 /**
  * @author rgb
  * @Description 订单产品相关的操作
@@ -99,6 +104,13 @@ public class ProductOrderController {
     public RespDTO<WaitExamOrderCouDTO> waitExamOrderCou() {
         return RespDTO.onSuc(productOrderFacade.waitExamOrderCou());
     }
+    
+    @ApiOperation(value = "已开通产品状态校验[by:rengb]", notes = "已开通产品状态校验")
+    @PostMapping("/openProductCheck")
+    @SysLogger("openProductCheck")
+    public RespDTO<OpenProductCheckDTO> openProductCheck(@RequestBody OpenProductCheckVO openProductCheckVO) {
+        return RespDTO.onSuc(productOrderFacade.hasPermission(openProductCheckVO));
+    }
 
     @ApiOperation(value = "客户中心-传入用户id查询已开通的功能(传userId)[by:wangfeng]", notes = "已开通信息")
     @PostMapping("/getInformationAvailableByUserId")

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

@@ -85,7 +85,7 @@
 		AND b.is_deleted = 'N'
 		AND c.is_deleted = 'N'
 		AND a.user_id = #{userId}
-		AND a.type = 1
+		AND a.type = 2
 		AND c.type = 1) d on b.id=d.product_id
 		where a.is_deleted='N' and b.is_deleted='N' and a.user_id=#{userId}
     </select>

docs/003.20181024初始化脚本/init_diagbotcloud.sql

@@ -34,10 +34,10 @@ CREATE TABLE `diag_lantone_product` (
   `name` varchar(50) NOT NULL DEFAULT '' COMMENT '产品名称',
   `decription` text NOT NULL COMMENT '产品介绍',
   `charge_type` varchar(50) NOT NULL DEFAULT '0' COMMENT '计费方式(1.流程计费2.机构计费3.用户计费)',
-  `url` varchar(255) NOT NULL COMMENT '产品地址',
+  `url` varchar(2083) NOT NULL COMMENT '产品地址',
   `service_status` int(11) NOT NULL DEFAULT '1' COMMENT '停用状态',
   `trial_status` int(11) NOT NULL DEFAULT '0' COMMENT '是否试用(0.否1.是)',
-  `trial_url` varchar(255) DEFAULT NULL COMMENT '试用地址',
+  `trial_url` varchar(2083) DEFAULT NULL COMMENT '试用地址',
   `access_type` varchar(50) NOT NULL DEFAULT '1,2,3' COMMENT '接入方式（1：online，2：接口方式，3：嵌入式）',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='朗通产品表';

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

@@ -973,7 +973,7 @@ public class UserFacade extends UserServiceImpl {
         int renewalSum = renewalSums.data;
         //System.out.println("========renewalSu====="+renewalSum);
         if(renewalSum>0){
-   		 return RespDTO.onError("该用户存在续费申请单，请先审核");
+   		 return RespDTO.onError("该用户无法删除，请先处理产品申请信息");
       	}
         //查询用户是否有待审核的产品数量
         RespDTO<Integer> auditSums = diagbotmanClient.getOrderByUserToAudit(baseIdVO.getId());
@@ -1304,7 +1304,7 @@ public class UserFacade extends UserServiceImpl {
         listName.add("编号");
         listName.add("注册时间");
         listName.add("认证单号");
-        listName.add("超管理名称");
+        listName.add("超管名称");
         listName.add("所在机构");
         listName.add("岗位名称");
         listName.add("手机号");
@@ -1356,7 +1356,7 @@ public class UserFacade extends UserServiceImpl {
         listName.add("编号");
         listName.add("注册时间");
         listName.add("审核通过时间");
-        listName.add("超管理名称");
+        listName.add("超管名称");
         listName.add("所在机构");
         listName.add("岗位名称");
         listName.add("手机号");