增加提示

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/RuleEnterpriseDTO.java

@@ -32,7 +32,7 @@ public class RuleEnterpriseDTO implements Serializable{
     /**
      * 状态值 1:有效 0:无效
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -110,12 +110,12 @@ public class RuleEnterpriseDTO implements Serializable{
         return this;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public RuleEnterpriseDTO setStatus(Integer status) {
-        this.status = status;
+    public RuleEnterpriseDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
         return this;
     }
 
@@ -215,7 +215,6 @@ public class RuleEnterpriseDTO implements Serializable{
                 "enterpriseRuleId=" + enterpriseRuleId +
                 ", ruleName='" + ruleName + '\'' +
                 ", enterpriseType=" + enterpriseType +
-                ", status=" + status +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", enterpriseIds='" + enterpriseIds + '\'' +

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/EnterpriseApiService.java

 package com.gic.enterprise.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.enterprise.dto.EnterpriseDTO;
@@ -15,35 +12,38 @@ import com.gic.enterprise.qo.BuyForGicQO;
 import com.gic.enterprise.qo.EnterpriseQO;
 import com.gic.enterprise.qo.OrderServiceQO;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 商户相关操作
- * @ClassName: EnterpriseApiService

- * @Description: 

- * @author guojuxing

- * @date 2019/8/8 4:39 PM

+ * @ClassName: EnterpriseApiService
+ * @Description: 
+ * @author guojuxing
+ * @date 2019/8/8 4:39 PM
  */
 public interface EnterpriseApiService {
 
     /**
      * 新增商户和超级管理员
-     * @Title: saveEnterprise

+     * @Title: saveEnterprise
      * @Description:
-    
 * @author guojuxing
+     * @author guojuxing
      * @param enterpriseDTO
      * @param
-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

-    
 */
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
+     */
     ServiceResponse<Integer> saveEnterprise(EnterpriseDTO enterpriseDTO);
 
 
     /**
      * 编辑保存
-     * @Title: editEnterprise

+     * @Title: editEnterprise
      * @Description:
-    
 * @author guojuxing
-     * @param enterpriseDTO

-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

-    
 */
+     * @author guojuxing
+     * @param enterpriseDTO
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
+     */
     ServiceResponse<Integer> editEnterprise(EnterpriseDTO enterpriseDTO);
     /**
      * editResourceSwitch 
@@ -59,87 +59,87 @@ public interface EnterpriseApiService {
 
     /**
      * 前置资源字典数据
-     * @Title: getResourceDict

+     * @Title: getResourceDict
      * @Description:
-    
* @author guojuxing 

-     * @return  com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.lang.String>>

-    
*/
+    * @author guojuxing 
+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.lang.String>>
+    */
     ServiceResponse<Map<String, String>> getResourceDict();
 
     /**
      * 修改商户信息
-     * @Title: editEnterpriseInfo

+     * @Title: editEnterpriseInfo
      * @Description:
-    
 * @author guojuxing
-     * @param enterpriseDTO

-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

-    
 */
+     * @author guojuxing
+     * @param enterpriseDTO
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
+     */
     ServiceResponse<Integer> editEnterpriseInfo(EnterpriseDTO enterpriseDTO);
 
     /**
      * 修改商户logo
-     * @Title: modifyEnterpriseLogo

+     * @Title: modifyEnterpriseLogo
      * @Description:
-    
* @author guojuxing
+    * @author guojuxing
      * @param enterpriseId 商户ID
-     * @param logoUrl
logo的图片地址
-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

-    
*/
+     * @param logoUrl logo的图片地址
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>
+    */
     ServiceResponse<String> modifyEnterpriseLogo(Integer enterpriseId, String logoUrl);
 
     /**
      * 查询单条数据
-     * @Title: getEnterpriseById

+     * @Title: getEnterpriseById
      * @Description:
-    
 * @author guojuxing
-     * @param enterpriseId

-     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.EnterpriseDTO>

-    
 */
+     * @author guojuxing
+     * @param enterpriseId
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.EnterpriseDTO>
+     */
     ServiceResponse<EnterpriseDTO> getEnterpriseById(Integer enterpriseId);
 
     /**
      * 获取商户前置资源开关数据
-     * @Title: getBusinessFrontRes

+     * @Title: getBusinessFrontRes
      * @Description:
-    
* @author guojuxing
-     * @param enterpriseId

-     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.EnterpriseResourceRelDTO>>

-    
*/
+    * @author guojuxing
+     * @param enterpriseId
+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.EnterpriseResourceRelDTO>>
+    */
     ServiceResponse<List<EnterpriseResourceRelDTO>> getBusinessFrontRes(Integer enterpriseId);
 
     /**
      * 商户停用
-     * @Title: disableEnterprise

+     * @Title: disableEnterprise
      * @Description:
-    
 * @author guojuxing
-     * @param enterpriseId

-     * @return  com.gic.api.base.commons.ServiceResponse

-    
 */
+     * @author guojuxing
+     * @param enterpriseId
+     * @return  com.gic.api.base.commons.ServiceResponse
+     */
     ServiceResponse disableEnterprise(Integer enterpriseId);
 
     /**
      * 商户启用
-     * @Title: enableEnterprise

+     * @Title: enableEnterprise
      * @Description:
-    
 * @author guojuxing
-     * @param enterpriseId

-     * @return  com.gic.api.base.commons.ServiceResponse

-    
 */
+     * @author guojuxing
+     * @param enterpriseId
+     * @return  com.gic.api.base.commons.ServiceResponse
+     */
     ServiceResponse enableEnterprise(Integer enterpriseId);
 
     /**
      * 分页查询商户信息
-     * @Title: listEnterprise

+     * @Title: listEnterprise
      * @Description:
-    
 * @author guojuxing
+     * @author guojuxing
      * @param search 公司名称/品牌名称
      * @param serviceVersion 服务版本 versionCode
      * @param status 0无效，1有效，2停用，3逾期 4：即将到期
      * @param orderBy  1:创建时间正序 2:创建时间倒叙 3:到期时间正序 4:到期时间倒叙  用EnterpriseListOrderByEnum.getOrderBy(orderBy)解析成sql，可以为null
      * @param pageNum 第几页
-     * @param pageSize
 每页多少条
-     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.EnterpriseListDTO>>

-    
 */
+     * @param pageSize 每页多少条
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.EnterpriseListDTO>>
+     */
     @Deprecated
     ServiceResponse<Page<EnterpriseListDTO>> listEnterprise(String search, Integer serviceVersion,
                                                                 Integer status, String orderBy,
@@ -147,22 +147,22 @@ public interface EnterpriseApiService {
 
     /**
      * 最新版本的查询接口
-     * @Title: listEnterprise

+     * @Title: listEnterprise
      * @Description:
-    
* @author guojuxing
-     * @param params

-     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.EnterpriseListDTO>>

-    
*/
+    * @author guojuxing
+     * @param params
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.EnterpriseListDTO>>
+    */
     ServiceResponse<Page<EnterpriseListDTO>> listEnterprise(EnterpriseQO params);
 
     /**
      * 模糊查询商户列表
-     * @Title: listEnterpriseByName

+     * @Title: listEnterpriseByName
      * @Description:
-    
 * @author guojuxing
-     * @param search

-     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.EnterpriseDTO>>

-    
 */
+     * @author guojuxing
+     * @param search
+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.EnterpriseDTO>>
+     */
     ServiceResponse<List<EnterpriseDTO>> listEnterpriseByName(String search);
 
     /**
@@ -174,12 +174,12 @@ public interface EnterpriseApiService {
 
     /**
      * 商户初始化标志改成已初始化状态
-     * @Title: initEnterprise

+     * @Title: initEnterprise
      * @Description:
-    
 * @author guojuxing
-     * @param enterpriseId

-     * @return  com.gic.api.base.commons.ServiceResponse

-    
 */
+     * @author guojuxing
+     * @param enterpriseId
+     * @return  com.gic.api.base.commons.ServiceResponse
+     */
     ServiceResponse initEnterprise(Integer enterpriseId);
     /**
      * listEnterpriseByIds 
@@ -225,54 +225,54 @@ public interface EnterpriseApiService {
 
     /**
      * 商户license信息
-     * @Title: listEnterpriseLicense

+     * @Title: listEnterpriseLicense
      * @Description:
-    
 * @author guojuxing
-     * @param enterpriseId

-     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.EnterpriseLicenseDTO>

-    
 */
+     * @author guojuxing
+     * @param enterpriseId
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.EnterpriseLicenseDTO>
+     */
     ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense(Integer enterpriseId);
 
     /**
      * 获取商户的某个license具体数据
-     * @Title: getEnterpriseLicense

+     * @Title: getEnterpriseLicense
      * @Description:
-    
* @author guojuxing
+    * @author guojuxing
      * @param enterpriseId
-     * @param licenseCode

-     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.EnterpriseLicenseDTO>

-    
*/
+     * @param licenseCode
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.EnterpriseLicenseDTO>
+    */
     ServiceResponse<EnterpriseLicenseDTO> getEnterpriseLicense(Integer enterpriseId, String licenseCode);
 
     /**
      * 服务订购列表数据
-     * @Title: listOrder

+     * @Title: listOrder
      * @Description:
-    
 * @author guojuxing
-     * @param params

-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Object>

-    
 */
+     * @author guojuxing
+     * @param params
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Object>
+     */
     ServiceResponse<Page<OrderGicDTO>> listOrder(OrderServiceQO params);
 
     /**
      * 取消订单
-     * @Title: cancelOrder

+     * @Title: cancelOrder
      * @Description:
-    
 * @author guojuxing
-     * @param orderId

-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

-    
 */
+     * @author guojuxing
+     * @param orderId
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     */
     ServiceResponse<Void> cancelOrder(Long orderId);
 
     /**
      * 服务订购成功，改变商户状态
-     * @Title: buyServiceSuccess

+     * @Title: buyServiceSuccess
      * @Description:
-    
 * @author guojuxing
-     * @param enterpriseId

+     * @author guojuxing
+     * @param enterpriseId
      * @param json ApplicationTokenDTO
-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

-    
 */
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     */
     ServiceResponse<Void> buyServiceSuccess(Integer enterpriseId, String json);
 
     
@@ -289,11 +289,11 @@ public interface EnterpriseApiService {
 
     /**
      * 商户基础服务到期提醒
-     * @Title: expireReminder

+     * @Title: expireReminder
      * @Description:
-    
* @author guojuxing
-     * @param param

-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

-    
*/
+    * @author guojuxing
+     * @param param
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+    */
     ServiceResponse<Void> expireReminder(String param);
 }