Merge branch 'developer' into 'master'

Developer

See merge request !959

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/QywxErrorLogDTO.java

@@ -94,4 +94,3 @@ public class QywxErrorLogDTO implements Serializable {
         this.createTime = createTime;
     }
 }
-

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffActiveDataDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * @description: 通讯录许可数据总览
+ * @Author: wenhua
+ * @Date: 2023/1/30 20:28
+ */
+public class StaffActiveDataDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private String id;
+    /**
+     * wx企业id
+     */
+    private String wxEnterpriseId;
+    /**
+     * 已购买许可总数
+     */
+    private Integer purchased;
+    /**
+     * 已使用许可总数
+     */
+    private Integer used;
+    /**
+     * 未激活许可总数
+     */
+    private Integer inactive;
+    /**
+     * 待转移许可总数
+     */
+    private Integer transfer;
+    /**
+     * 已激活许可总数
+     */
+    private Integer activated;
+    /**
+     * 已过期许可总数
+     */
+    private Integer expired;
+    /**
+     * 其他占用许可总数
+     */
+    private Integer occupy;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public Integer getPurchased() {
+        return purchased;
+    }
+
+    public void setPurchased(Integer purchased) {
+        this.purchased = purchased;
+    }
+
+    public Integer getInactive() {
+        return inactive;
+    }
+
+    public void setInactive(Integer inactive) {
+        this.inactive = inactive;
+    }
+
+    public Integer getTransfer() {
+        return transfer;
+    }
+
+    public void setTransfer(Integer transfer) {
+        this.transfer = transfer;
+    }
+
+    public Integer getActivated() {
+        return activated;
+    }
+
+    public void setActivated(Integer activated) {
+        this.activated = activated;
+    }
+
+    public Integer getExpired() {
+        return expired;
+    }
+
+    public void setExpired(Integer expired) {
+        this.expired = expired;
+    }
+
+    public Integer getOccupy() {
+        return occupy;
+    }
+
+    public void setOccupy(Integer occupy) {
+        this.occupy = occupy;
+    }
+
+    public Integer getUsed() {
+        return used;
+    }
+
+    public void setUsed(Integer used) {
+        this.used = used;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

 package com.gic.haoban.manage.api.dto;
 
+import com.gic.commons.util.DateUtil;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -99,12 +101,96 @@ public class StaffDTO implements Serializable {
     private String clerkName;
     private String defaultGicEid;
     private Integer addNum;
-    private Integer activeStatus;
     private String enterpriseId;
     private String storeId;
-    private int openConcatFlag = 0 ;
+    private int openConcatFlag = 0;
+
+    private String ownerRemark;
+
+    /**
+     * 许可激活时间
+     */
+    private Date activeTime;
+    /**
+     * 许可过期时间
+     */
+    private Date expireTime;
+    /**
+     * 许可状态  0 未激活，1 正常有效，2 即将过期，3 已过期
+     */
+    private Integer permitState;
+    /**
+     * 是否授权  0否1是
+     */
+    private Integer authorizedFlag;
+    /**
+     * 企微激活码
+     */
+    private String activeCode;
+
+    public String getActiveCode() {
+        return activeCode;
+    }
+
+    public void setActiveCode(String activeCode) {
+        this.activeCode = activeCode;
+    }
+
+    public Integer getAuthorizedFlag() {
+        // 如果员工有qr_code,则代表已经授权
+        if (null != this.qrCode)
+            this.authorizedFlag = 1;
+        else
+            this.authorizedFlag = 0;
+        return authorizedFlag;
+    }
+
+    public void setAuthorizedFlag(Integer authorizedFlag) {
+        this.authorizedFlag = authorizedFlag;
+    }
+
+    public Date getActiveTime() {
+        return activeTime;
+    }
+
+    public void setActiveTime(Date activeTime) {
+        this.activeTime = activeTime;
+    }
+
+    public Date getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Date expireTime) {
+        this.expireTime = expireTime;
+    }
+
+    public Integer getPermitState() {
+        /**
+         * 根据当前时间判断许可状态  0 未激活，1 正常有效，2 即将过期，3 已过期
+         * 正常有效：过期时间>30天
+         * 即将过期：未过期且过期时间<=30天
+         * 已过期：当前许可已到过期时间
+         */
+        Date now = new Date();
+        if (null == this.expireTime) {
+            this.permitState = 0;
+        } else if (now.after(this.expireTime)) {
+            this.permitState = 3;
+        } else if (now.before(this.expireTime)) {
+            Date date = DateUtil.addDay(now, 30);
+            if (date.after(this.expireTime)) {
+                this.permitState = 2;
+            } else {
+                this.permitState = 1;
+            }
+        }
+        return permitState;
+    }
 
-    private String ownerRemark ;
+    public void setPermitState(Integer permitState) {
+        this.permitState = permitState;
+    }
 
     public String getOwnerRemark() {
         return ownerRemark;
@@ -396,14 +482,6 @@ public class StaffDTO implements Serializable {
         this.addNum = addNum;
     }
 
-    public Integer getActiveStatus() {
-        return activeStatus;
-    }
-
-    public void setActiveStatus(Integer activeStatus) {
-        this.activeStatus = activeStatus;
-    }
-
     public String getEnterpriseId() {
         return enterpriseId;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/TransferActiveCodeDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import cn.hutool.core.collection.CollUtil;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 转移返回结果DTO
+ * @Author: wenhua
+ * @Date: 2023/2/3 10:47
+ */
+public class TransferActiveCodeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 转移总数
+     */
+    private Integer totalNum;
+    /**
+     * 成功总数
+     */
+    private Integer successNum;
+    /**
+     * 失败总数
+     */
+    private Integer failedNum;
+    /**
+     * 成功明细
+     */
+    private List<Map<String, String>> successList;
+    /**
+     * 失败明细
+     */
+    private List<Map<String, String>> failedList;
+
+    public List<Map<String, String>> getSuccessList() {
+        return successList;
+    }
+
+    public void setSuccessList(List<Map<String, String>> successList) {
+        this.successList = successList;
+    }
+
+    public Integer getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(Integer totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    public Integer getSuccessNum() {
+        return successNum;
+    }
+
+    public void setSuccessNum(Integer successNum) {
+        this.successNum = successNum;
+    }
+
+    public Integer getFailedNum() {
+        return failedNum;
+    }
+
+    public void setFailedNum(Integer failedNum) {
+        this.failedNum = failedNum;
+    }
+
+    public List<Map<String, String>> getFailedList() {
+        return failedList;
+    }
+
+    public void setFailedList(List<Map<String, String>> failedList) {
+        this.failedList = failedList;
+    }
+
+    //操作日志记录
+    public String logRecord() {
+        StringBuilder log = new StringBuilder();
+        //记录单个转移的成功日志
+        if (CollUtil.isNotEmpty(this.successList) && this.totalNum==1){
+            Map<String, String> stringMap = this.successList.get(0);
+            log.append("将"+stringMap.get("handoverStaffName")+"-"+stringMap.get("handoverStaffPhone")==null?"":stringMap.get("handoverStaffPhone")+"的许可手动转移给"
+                    +stringMap.get("takeoverStaffName")+"-"+stringMap.get("takeoverStaffPhone")==null?"":stringMap.get("takeoverStaffPhone"));
+            return log.toString();
+        }
+        log.append("共需转移" + this.totalNum + "，成功" + this.successNum + "，失败" + this.failedNum + "。");
+        if (CollUtil.isNotEmpty(this.failedList)) {
+            log.append("失败明细：");
+            for (int i=1;i<=this.failedList.size();i++){
+                Map<String, String> stringMap = this.failedList.get(i - 1);
+                log.append(i+".（转移成员："+stringMap.get("handoverStaffName")+"，接收成员："+stringMap.get("takeoverStaffName")+"，失败原因错误码："+stringMap.get("errorCode")+"）；");
+            }
+            //去掉末尾分号
+            String substring = log.substring(0, log.toString().length() - 1);
+            return substring;
+        }
+        return log.toString();
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/TransferActiveCodeQDTO.java

+package com.gic.haoban.manage.api.dto.qdto;
+
+import java.io.Serializable;
+
+/**
+ * @description: 通讯录转移许可QO
+ * @Author: wenhua
+ * @Date: 2023/1/30 20:39
+ */
+public class TransferActiveCodeQDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 转移成员的staffId
+     */
+    private String handoverStaffId;
+    /**
+     * 接收成员的staffId
+     */
+    private String takeoverStaffId ;
+
+    public String getHandoverStaffId() {
+        return handoverStaffId;
+    }
+
+    public void setHandoverStaffId(String handoverStaffId) {
+        this.handoverStaffId = handoverStaffId;
+    }
+
+    public String getTakeoverStaffId() {
+        return takeoverStaffId;
+    }
+
+    public void setTakeoverStaffId(String takeoverStaffId) {
+        this.takeoverStaffId = takeoverStaffId;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ApplicationApiService.java

@@ -8,7 +8,8 @@ public interface ApplicationApiService {
 
 	List<ApplicationDTO> listApplication();
 
-	List<ApplicationDTO> listByApplications(List<String> applicationIds);
+	//无效接口
+//	List<ApplicationDTO> listByApplications(List<String> applicationIds);
 
 	List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId);
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/CheckQywxSettingApiService.java

@@ -16,7 +16,8 @@ public interface CheckQywxSettingApiService {
      * @param wxEnterpriseId
      * @param name
      */
-    void setFriendSetting(String wxEnterpriseId, String name);
+    //无效接口
+//    void setFriendSetting(String wxEnterpriseId, String name);
 
     /**
      * 获取设置的好友流程

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java

@@ -34,7 +34,8 @@ public interface DepartmentApiService {
 	 * @param wxEnterpriseId
 	 * @return
 	 */
-	List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId);
+	//无效接口
+//	List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId);
 	
 	/**
 	 * 查wxEnterprise下所有门店(溢出门店)
@@ -137,10 +138,11 @@ public interface DepartmentApiService {
      * @param
      * @return
      */
-    ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String wxUserId);
-
-    
-	boolean isInitLocked(String wxEnterpriseId);
+	//无效接口
+//    ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String wxUserId);
+//
+//
+//	boolean isInitLocked(String wxEnterpriseId);
 	
 	void syncWxDepartmentByParentMQ(String res);
 	/**

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java

@@ -93,7 +93,8 @@ public interface ExternalClerkRelatedApiService {
      * @param enterpriseId
      * @return
      */
-    ExternalClerkRelatedDTO getClerkFriendByUnionid(String enterpriseId, String clerkId, String unionid);
+    //无效接口
+//    ExternalClerkRelatedDTO getClerkFriendByUnionid(String enterpriseId, String clerkId, String unionid);
 
     /**
      * 获取企业下的关联关系列表
@@ -194,7 +195,8 @@ public interface ExternalClerkRelatedApiService {
     
     com.gic.api.base.commons.ServiceResponse<Boolean> isQwFriend(String enterpriseId, String staffId, String memberId) ;
 
-    com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId, String memberId) ;
+    //无效接口
+//    com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId, String memberId) ;
     
     List<String> listMemberAndClerk(List<String> memberIdList , List<String> clerkIdList , String enterpriseId) ; 
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanTimerApiService.java

@@ -100,15 +100,4 @@ public interface HaobanTimerApiService {
      */
     public ServiceResponse<Void> ownerDimission(String params);
 
-    /**
-     * 
-     * @Title: activedAccountTimer
-     * @Description: 获取激活账号
-     * @author xgh331 
-     * @param params
-     * @return
-     * @throws
-     */
-    public ServiceResponse<Void> activedAccountTimer(String params);
-
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -224,7 +224,8 @@ public interface MemberUnionidRelatedApiService {
      * @author mozhu
      * @date 2022-09-09 14:18:34
      */
-    void addDelFriendEventTest(String param);
+    //无效接口
+//    void addDelFriendEventTest(String param);
 
 
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QwFriendApiService.java

@@ -68,8 +68,9 @@ public interface QwFriendApiService {
     * @return
     * @throws
      */
-    public ServiceResponse<List<QwPendingIdDTO>> listPendingIdByExternalid(String enterpriseId,
-            List<String> externalUserIdList);
+    //无效接口
+//    public ServiceResponse<List<QwPendingIdDTO>> listPendingIdByExternalid(String enterpriseId,
+//            List<String> externalUserIdList);
     
     /**
      * 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QywxTagApiService.java

@@ -138,7 +138,8 @@ public interface QywxTagApiService {
      * @param relationId
      * @return
      */
-    public QywxTagRelationDTO getQywxTagRelationByRelationId(String relationId);
+    //无效接口
+//    public QywxTagRelationDTO getQywxTagRelationByRelationId(String relationId);
 
 
     /**

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.qdto.TransferActiveCodeQDTO;
 import com.gic.haoban.manage.api.dto.role.StoreRoleDTO;
 
 import java.util.List;
@@ -19,7 +20,8 @@ public interface StaffApiService {
     List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
 
     Page<StaffDTO> pageStaff(List<String> departmentId, Integer activeFlag,
-                             String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId);
+                             String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId , String permitState,
+                             Integer occupy);
 
     /**
      * 保存微信成员
@@ -66,9 +68,10 @@ public interface StaffApiService {
      */
     StaffDTO getByUserIdAndReflushWhenNoPhone(String userId, String wxEnterpriseId);
 
-    StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
+    //无效接口
+//    StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
 
-    StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
+//    StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
 
     void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId, String taskId);
 
@@ -147,7 +150,8 @@ public interface StaffApiService {
      * @author : YongEn
      * @date : 2022/3/23
      */
-    List<StaffDTO> listAllStaffByWxEnterpriseId(String wxEnterpriseId);
+    //无效接口
+//    List<StaffDTO> listAllStaffByWxEnterpriseId(String wxEnterpriseId);
 
 
     /**
@@ -159,7 +163,8 @@ public interface StaffApiService {
      * @author mozhu
      * @date 2021-12-21 17:23:36
      */
-    List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId);
+    //无效接口
+//    List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId);
 
 
     /**
@@ -264,7 +269,8 @@ public interface StaffApiService {
      * @author mozhu
      * @date 2022-05-27 09:43:00
      */
-    boolean isSuperAdmin(String clerkId);
+    //无效接口
+//    boolean isSuperAdmin(String clerkId);
 
 
     /**
@@ -276,7 +282,8 @@ public interface StaffApiService {
      * @author mozhu
      * @date 2022-05-30 11:46:08
      */
-    List<String> getHaoBanStoreRolesByEnterpriseId(String enterpriseId, String wxEnterpriseId);
+    //无效接口
+//    List<String> getHaoBanStoreRolesByEnterpriseId(String enterpriseId, String wxEnterpriseId);
 
 
     /**
@@ -318,4 +325,9 @@ public interface StaffApiService {
      * @date 2022-10-21 00:25:46
      */
     List<StaffDTO> listBindStoreIds(List<String> storeIds,String wxEnterpriseId);
+
+    /**
+     * 转移员工许可
+     */
+    com.gic.api.base.commons.ServiceResponse<TransferActiveCodeDTO> batchTransferLicense(List<TransferActiveCodeQDTO> transferActiveCodeQOList,String wxEnterpriseId);
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java

@@ -65,7 +65,8 @@ public interface StaffClerkRelationApiService {
      * @param staffId
      * @param channelCode
      */
-    void delBindByStoreId(String wxEnterpriseId,String storeId, String staffId,int channelCode);
+    //无效接口
+//    void delBindByStoreId(String wxEnterpriseId,String storeId, String staffId,int channelCode);
 
 
     StaffClerkRelationDTO getOneByClerkId(String clerkId);

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/SyncHaobanToGicApiService.java

@@ -13,7 +13,8 @@ public interface SyncHaobanToGicApiService {
 	 * @param gicClerkId
 	 * @param name
 	 */
-	public void updateGicClerk(String gicClerkId,String name);
+	//无效接口
+//	public void updateGicClerk(String gicClerkId,String name);
 	
 	/**
 	 * 判断gicClerk是否能新增
@@ -23,7 +24,7 @@ public interface SyncHaobanToGicApiService {
 	 * @param gicStoreId
 	 * @return
 	 */
-	public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId);
+//	public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId);
 	
 	/**
 	 * 
@@ -34,7 +35,7 @@ public interface SyncHaobanToGicApiService {
 	 * @param memberChangeReason 1会员自行转移2后台手动选择3企业转移会员4店员删除5订单操作6开卡扫描二维码7企业号认领8企业号分配9app转岗移除
 	 * @param operId
 	 */
-	public boolean gicClerkMove(String gicClerkId,String gicOldStoreId,String gicNewStoreId,int clerkChangeReason,int memberChangeReason,String operId);
+//	public boolean gicClerkMove(String gicClerkId,String gicOldStoreId,String gicNewStoreId,int clerkChangeReason,int memberChangeReason,String operId);
 	
 	
 	/**
@@ -44,7 +45,7 @@ public interface SyncHaobanToGicApiService {
 	 * @param gicClerkId
 	 * @return
 	 */
-	public boolean setStoreManager(String gicEnterpriseId,String gicStoreId,String gicClerkId);
+//	public boolean setStoreManager(String gicEnterpriseId,String gicStoreId,String gicClerkId);
 
 	boolean syncClerkToGicClerkAdd(String storeId, String clerkCode, Integer sex, String name, String phoneNumber,
 								   String nationCode, String postionName);

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ValidationCodeApiService.java

@@ -13,7 +13,8 @@ public interface ValidationCodeApiService {
      * @param phoneNumber
      * @param code
      */
-    int smsValidationCode(String phoneNumber, String code);
+    //接口无效
+//    int smsValidationCode(String phoneNumber, String code);
 
     /**
      * 短信验证码
@@ -22,7 +23,7 @@ public interface ValidationCodeApiService {
      * @param phoneNumber
      * @param code
      */
-    int smsValidationCode(String nationCode,String phoneNumber, String code);
+//    int smsValidationCode(String nationCode,String phoneNumber, String code);
 
     SendSmsResponse sendValidationCode(String nationCode, String phoneNumber, String code);
 
@@ -33,7 +34,8 @@ public interface ValidationCodeApiService {
      * @param code
      * @return
      */
-    int verifyValidationCode(String phoneNumber, String code);
+    //接口无效
+//    int verifyValidationCode(String phoneNumber, String code);
     
    /**
     * 
@@ -43,7 +45,7 @@ public interface ValidationCodeApiService {
     * @param unReadCount
     * @return
     */
-	int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unReadPeople,String unReadCount,String enterpriseId);
+//	int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unReadPeople,String unReadCount,String enterpriseId);
 
     /**
      * 发送验证码

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseActiveDataApiService.java

+package com.gic.haoban.manage.api.service;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.StaffActiveDataDTO;
+
+/**
+ * @description: 通讯录数据总览
+ * @Author: wenhua
+ * @Date: 2023/2/2 10:11
+ */
+public interface WxEnterpriseActiveDataApiService {
+
+    /**
+     * 通过wxEnterpriseId新增或者更新WxEnterpriseActiveData
+     * @param wxEnterpriseId
+     * @return
+     */
+    ServiceResponse<Integer> saveOrUpdate(String wxEnterpriseId);
+
+    ServiceResponse<StaffActiveDataDTO> getWxEnterpriseActiveDataByWxEnterpriseId(String wxEnterpriseId);
+
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java

@@ -152,7 +152,8 @@ public interface WxEnterpriseApiService {
      * @param wxEnterpriseId
      * @return
      */
-    WelcomeDTO getWelcome(String wxEnterpriseId);
+    //接口无效
+//    WelcomeDTO getWelcome(String wxEnterpriseId);
 
     /**
      * 获取欢迎语

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -23,7 +23,8 @@ public interface WxEnterpriseRelatedApiService {
 	
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber ,boolean filterFlag);
 
-	String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
+	//接口无效
+//	String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
 
 	boolean enterpriseUseNew(String enterpriseId);
 
@@ -35,7 +36,8 @@ public interface WxEnterpriseRelatedApiService {
 	 * 返回在一定时期内的信息
 	 * @return
 	 */
-	List<EnterpriseDetailDTO> queryBindGicEnterpriseByTime(String seqTime);
+	//接口无效
+//	List<EnterpriseDetailDTO> queryBindGicEnterpriseByTime(String seqTime);
 
 
 	/**

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkApiService.java

@@ -2,12 +2,9 @@ package com.gic.haoban.manage.api.service.hm;
 
 import java.util.List;
 
-import com.gic.api.base.commons.BasePageInfo;
-import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkWxaDTO;
-import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 
 /**
  * 
@@ -42,7 +39,6 @@ public interface HmLinkApiService {
     public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
             Integer linkType,List<String> creatorIdList);
 
-    public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
 
     public ServiceResponse<String> save(HmLinkDTO dto);
 
@@ -57,4 +53,18 @@ public interface HmLinkApiService {
      */
     public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, Integer whitchStore, String storeId,
             String clerkId, String linkShortCode, String mixPhone, String unionid , String memberId);
+    
+    /**
+     * 
+    * @Title: getMemberClerkHm
+    * @Description: 获取会员关联导购的活码
+    * @author xugh
+    * @param enterpriseId
+    * @param memberId
+    * @param unionid
+    * @param linkId
+    * @return
+    * @throws
+     */
+    public ServiceResponse<HmLinkWxaDTO> getMemberClerkHm(String enterpriseId , String memberId , String unionid , Long linkId) ;
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/notify/PendingTaskApiService.java

@@ -91,7 +91,8 @@ public interface PendingTaskApiService {
      * @param relationId
      * @return
      */
-    public ServiceResponse<Boolean> deletePendingTaskByRelationId(String relationId);
+    //无效接口
+//    public ServiceResponse<Boolean> deletePendingTaskByRelationId(String relationId);
 
 
     /**
@@ -109,7 +110,8 @@ public interface PendingTaskApiService {
      * @param endTime
      * @return
      */
-    public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime);
+    //无效接口
+//    public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime);
 
     /**
      * 更新失效或者结束时间 活动任务

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanMenuApiService.java

@@ -27,7 +27,8 @@ public interface HaobanMenuApiService {
      *
      * @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>
      */
-    ServiceResponse<List<String>> getAllMenuCodeList();
+    //无效接口
+//    ServiceResponse<List<String>> getAllMenuCodeList();
 
 
     ServiceResponse<List<HaobanMenuDTO>> getAllMenuList();
@@ -60,9 +61,10 @@ public interface HaobanMenuApiService {
      * @param clerkType      职员类型
      * @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>
      */
-    ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType);
+    //无效接口
+//    ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType);
 
-    ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode);
+//    ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode);
 
     ServiceResponse<String> getMenuNameByCode(String menuCode);
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java

@@ -72,5 +72,6 @@ public interface HaobanRoleApiService {
      * @author mozhu
      * @date 2022-10-09 14:16:12
      */
-    ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId,Integer clerkType,Integer systemFlag);
+    //无效接口
+//    ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId,Integer clerkType,Integer systemFlag);
 }

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.authcenter.commons.dto.AuthcenterUserDetails;
 import com.gic.authcenter.commons.util.SessionContextUtil;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.GlobalVar;
 import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
@@ -76,6 +78,8 @@ public class EnterpriseController extends WebBaseController {
     private QywxUserApiService qywxUserApiService;
     @Autowired
     private StoreGroupService storeGroupService ;
+    @Autowired
+    private ClerkService clerkService;
 
     private static final String QYWX_TAG_OPRN_KEY = "qywx-tag-open";
     private static final String QYWX_TAG_OPRN_KEY_LOCK = "qywx-tag-open-lock";
@@ -479,18 +483,24 @@ public class EnterpriseController extends WebBaseController {
     
     //gic企业列表
     @RequestMapping("enterprise-search")
-    public HaobanResponse gicEnterpriseDetail(String enterpriseName) {
-        if (StringUtils.isEmpty(enterpriseName)) {
+    public HaobanResponse gicEnterpriseDetail(String enterpriseId) {
+        if (StringUtils.isEmpty(enterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_1);
         }
-        EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseName);
-        EnterpriseSearchVO vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);
-        if (vo != null) {
-            String enterpriseId = vo.getEnterpriseId();
+        EnterpriseSearchVO vo = new EnterpriseSearchVO();
         EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
         if (enterprise != null) {
+            vo.setEnterpriseId(enterpriseId);
+            vo.setEnterpriseName(enterprise.getEnterpriseName());
             vo.setBrandName(enterprise.getBrandName());
         }
+        ClerkDTO clerk = clerkService.getSuperAdminByEnterpriseId(enterpriseId);
+        if (clerk != null) {
+            vo.setClerkId(clerk.getClerkId());
+            vo.setClerkCode(clerk.getClerkCode());
+            vo.setClerkName(clerk.getClerkName());
+            vo.setPhoneNumber(clerk.getPhoneNumber());
+            vo.setNationCode(clerk.getNationcode());
         }
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/ApplicationMapper.java

@@ -21,6 +21,6 @@ public interface ApplicationMapper {
 
 	List<TabHaobanApplication> listApplication();
 	
-	List<TabHaobanApplication> listByApplicationIds(@Param("applicationIds")List<String> applicationIds);
+//	List<TabHaobanApplication> listByApplicationIds(@Param("applicationIds")List<String> applicationIds);
 	
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -41,7 +41,7 @@ public interface DepartmentMapper {
 	Page<TabHaobanDepartment> pageDepartmentByParams(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("keyword")String keyword, 
 			@Param("storeFlag")Integer storeFlag, @Param("recycleFlag")Integer recycleFlag);
 	
-	List<TabHaobanDepartment> listStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
+//	List<TabHaobanDepartment> listStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 	
 	TabHaobanDepartment getRootByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/QywxTagRelationMapper.java

@@ -22,7 +22,7 @@ public interface QywxTagRelationMapper {
 
     /**
      */
-    TabQywxTagRelation selectByPrimaryKey(String qywxTagRelationId);
+//    TabQywxTagRelation selectByPrimaryKey(String qywxTagRelationId);
 
     /**
      */

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffDepartmentRelatedMapper.java

@@ -23,9 +23,9 @@ public interface StaffDepartmentRelatedMapper {
 
     int delByStaffid(@Param("staffId") String staffId);
 
-	TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(@Param("departmentId")String departmentId, @Param("staffId")String staffId);
+//	TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(@Param("departmentId")String departmentId, @Param("staffId")String staffId);
 
-	TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
+//	TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
 
 	int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -20,6 +20,13 @@ public interface StaffMapper {
 
     List<TabHaobanStaff> listByIds(@Param("staffIds") List<String> staffIds);
 
+    /**
+     * 特殊查询，可以查询出被删除的成员信息
+     * @param staffIds
+     * @return
+     */
+    List<TabHaobanStaff> listByStaffIdList(@Param("staffIds") List<String> staffIds);
+
     TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId") String userId,  @Param("wxEnterpriseId") String wxEnterpriseId);
     
     TabHaobanStaff getDeleteUser(@Param("userId") String userId,  @Param("wxEnterpriseId") String wxEnterpriseId) ;
@@ -35,10 +42,13 @@ public interface StaffMapper {
                              @Param("keyword") String keyword,
                              @Param("departmentIds") List<String> departmentIds,
                              @Param("wxEnterpriseId") String wxEnterpriseId,
-                             @Param("relationFlag") Integer relationFlag);
+                             @Param("relationFlag") Integer relationFlag,@Param("permitState")String permitState,
+                             @Param("occupy")Integer occupy);
 
     List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber") String phoneNumber);
 
+    int delStaff(@Param("staffId") String staffId) ;
+    
     int cleanStaff(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
 
     List<String> listUserStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
@@ -138,7 +148,7 @@ public interface StaffMapper {
      */
     int updateActiveStatusById(@Param("staffId")String staffId, @Param("activeTime")Date activeTime, 
             @Param("expireTime")Date expireTime,
-            @Param("activeCode")String activeCode, @Param("activeStatus")Integer activeStatus);
+            @Param("activeCode")String activeCode);
     
     // 初始化激活码信息,先删除
     void deleteActivieInfo(@Param("wxEnterpriseId") String wxEnterpriseId) ;
@@ -162,5 +172,17 @@ public interface StaffMapper {
     List<TabHaobanStaff> listAllByPage(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("startItem") int startItem , @Param("pageSize") int pageSize);
 
     void updateOpenConcatFlag(@Param("wxUserIdList")List<String> wxUserIdList , @Param("mixFlag")int mixFlag);
+    /**
+     * 查询其他占用许可总数
+     */
+    Integer getOccupyNum(@Param("wxEnterpriseId") String wxEnterpriseId);
+
+    /**
+     * 通过wxOpenUserId更新企业成员许可信息
+     */
+    void updateStaffInfoByStaffId(@Param("staffId") String staffId,
+                                       @Param("activeTime")Date activeTime,
+                                       @Param("expireTime")Date expireTime,
+                                       @Param("activeCode")String activeCode);
     
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -91,9 +91,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
      * @param unionId
      * @return
      */
-    TabHaobanExternalClerkRelated getClerkExternalByUnionId(@Param("enterpriseId") String enterpriseId,
-                                                            @Param("clerkId") String clerkId,
-                                                            @Param("unionId") String unionId);
+//    TabHaobanExternalClerkRelated getClerkExternalByUnionId(@Param("enterpriseId") String enterpriseId,
+//                                                            @Param("clerkId") String clerkId,
+//                                                            @Param("unionId") String unionId);
 
     /**
      * @param relationKey

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanWxEnterpriseActiveDataMapper.java

+package com.gic.haoban.manage.service.dao.mapper;
+
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseActiveData;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @Author: wenhua
+ * @Date: 2023/1/31 11:20
+ */
+@Mapper
+public interface TabHaobanWxEnterpriseActiveDataMapper {
+
+    int insert(TabHaobanWxEnterpriseActiveData tabHaobanWxEnterpriseActiveData);
+
+    TabHaobanWxEnterpriseActiveData getWxEnterpriseActiveDataByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
+
+    int updateActiveDataByWxEnterpriseId(TabHaobanWxEnterpriseActiveData activeData);
+
+
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseRelatedMapper.java

@@ -28,7 +28,7 @@ public interface WxEnterpriseRelatedMapper {
 	
 	List<TabHaobanWxEnterpriseRelated> listEnterpriseByEnterpriseIds(@Param("enterpriseIds")List<String> enterpriseIds);
 
-    List<TabHaobanWxEnterpriseRelated> listEnterpriseByTime(@Param("time")String time);
+//    List<TabHaobanWxEnterpriseRelated> listEnterpriseByTime(@Param("time")String time);
 
     /**
      * 查询企业下唯一商户

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatMapper.java

@@ -73,4 +73,6 @@ public interface GroupChatMapper {
     public void updateChatEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId,
             @Param("enterpriseId") String enterpriseId, @Param("groupChatIdList") List<Long> groupChatIdList,
             @Param("force") int force);
+    
+    public List<GroupChatDTO> listChangeOwner() ;
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeAccountInterceptLogMapper.java

@@ -65,4 +65,3 @@ public interface TabHaobanQywxFeeAccountInterceptLogMapper {
      */
     List<TabHaobanQywxFeeAccountInterceptLog> queryByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
 }
-

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeAccountStaffMapper.java

@@ -16,14 +16,6 @@ import java.util.List;
 public interface TabHaobanQywxFeeAccountStaffMapper {
 
     /**
-     * 通过ID查询单条数据
-     *
-     * @param feeAccountId 主键
-     * @return 实例对象
-     */
-    TabHaobanQywxFeeAccountStaff selectByActiveCode(@Param("wxEnterpriseId")String wxEnterpriseId , @Param("activeCode")String activeCode);
-
-    /**
      * 新增数据
      *
      * @param tabHaobanQywxFeeAccountStaff 实例对象

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeMapper.java

@@ -15,14 +15,6 @@ import java.util.List;
 public interface TabHaobanQywxFeeMapper {
 
     /**
-     * 通过ID查询单条数据
-     *
-     * @param qwFeeId 主键
-     * @return 实例对象
-     */
-    TabHaobanQywxFee queryById(Long qwFeeId);
-
-    /**
      * 查询指定行数据
      *
      * @param qywxFeeListQDTO qywx qdto费用列表
@@ -41,30 +33,6 @@ public interface TabHaobanQywxFeeMapper {
     int insert(TabHaobanQywxFee tabHaobanQywxFee);
 
     /**
-     * 批量新增数据（MyBatis原生foreach方法）
-     *
-     * @param entities List<TabHaobanQywxFee> 实例对象列表
-     * @return 影响行数
-     */
-    int insertBatch(@Param("entities") List<TabHaobanQywxFee> entities);
-
-    /**
-     * 修改数据
-     *
-     * @param tabHaobanQywxFee 实例对象
-     * @return 影响行数
-     */
-    int update(TabHaobanQywxFee tabHaobanQywxFee);
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param qwFeeId 主键
-     * @return 影响行数
-     */
-    int deleteById(Long qwFeeId);
-
-    /**
      * 最新一条将要被拦截记录
      *
      * @param wxEnterpriseId wx企业标识

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderAccountMapper.java

 package com.gic.haoban.manage.service.dao.mapper.fee;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrderAccount;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * 企业微信收费订单账号(激活码)(TabHaobanQywxFeeOrderAccount)表数据库访问层
  *
@@ -46,5 +51,9 @@ public interface TabHaobanQywxFeeOrderAccountMapper {
      * @date 2022-08-05 11:24:02
      */
     int countOrderAccountStatus(@Param("status") Integer status,@Param("wxEnterpriseId")  String wxEnterpriseId);
+
+    List<TabHaobanQywxFeeOrderAccount> listAccount(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("orderId")String orderId);
+
+    List<HashMap<String,Integer>> countStatusByWxEnterpriseId(@Param("wxEnterpriseId")  String wxEnterpriseId);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderMapper.java

 package com.gic.haoban.manage.service.dao.mapper.fee;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
@@ -48,5 +50,8 @@ public interface TabHaobanQywxFeeOrderMapper {
      * @date 2022-08-12 10:42:36
      */
     int hasOrder(@Param("wxEnterpriseId") String wxEnterpriseId);
+
+
+    List<TabHaobanQywxFeeOrder> listOrder(@Param("wxEnterpriseId") String wxEnterpriseId);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java

@@ -45,7 +45,7 @@ public interface TabHaobanMenuMapper {
 
     List<TabHaobanMenu> getAllMenuList();
 
-    List<String> getAllMenuCodeList();
+//    List<String> getAllMenuCodeList();
 
     List<TabHaobanMenu> getPidMenuList();
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaff.java

@@ -49,12 +49,39 @@ public class TabHaobanStaff implements Serializable {
     private String wxOpenId;
     private String qrCode;
     private Integer addNum;
-    private Integer activeStatus;
 
     @Transient
     private String departmentIds;
     private int openConcatFlag ;
 
+    private Date activeTime;
+    private Date expireTime;
+    private String activeCode;
+
+    public Date getActiveTime() {
+        return activeTime;
+    }
+
+    public void setActiveTime(Date activeTime) {
+        this.activeTime = activeTime;
+    }
+
+    public Date getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Date expireTime) {
+        this.expireTime = expireTime;
+    }
+
+    public String getActiveCode() {
+        return activeCode;
+    }
+
+    public void setActiveCode(String activeCode) {
+        this.activeCode = activeCode;
+    }
+
     public int getOpenConcatFlag() {
         return openConcatFlag;
     }
@@ -247,11 +274,4 @@ public class TabHaobanStaff implements Serializable {
         this.addNum = addNum;
     }
 
-    public Integer getActiveStatus() {
-        return activeStatus;
-    }
-
-    public void setActiveStatus(Integer activeStatus) {
-        this.activeStatus = activeStatus;
-    }
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterpriseActiveData.java

+package com.gic.haoban.manage.service.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description: 通讯录许可数据总览
+ * @Author: wenhua
+ * @Date: 2023/1/30 20:28
+ */
+public class TabHaobanWxEnterpriseActiveData implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+    /**
+     * wx企业id
+     */
+    private String wxEnterpriseId;
+    /**
+     * 已购买许可总数
+     */
+    private Integer purchased;
+    /**
+     * 已使用许可总数
+     */
+    private Integer used;
+    /**
+     * 未激活许可总数
+     */
+    private Integer inactive;
+    /**
+     * 待转移许可总数
+     */
+    private Integer transfer;
+    /**
+     * 已激活许可总数
+     */
+    private Integer activated;
+    /**
+     * 已过期许可总数
+     */
+    private Integer expired;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer deleteFlag;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public Integer getPurchased() {
+        return purchased;
+    }
+
+    public void setPurchased(Integer purchased) {
+        this.purchased = purchased;
+    }
+
+    public Integer getInactive() {
+        return inactive;
+    }
+
+    public void setInactive(Integer inactive) {
+        this.inactive = inactive;
+    }
+
+    public Integer getTransfer() {
+        return transfer;
+    }
+
+    public void setTransfer(Integer transfer) {
+        this.transfer = transfer;
+    }
+
+    public Integer getActivated() {
+        return activated;
+    }
+
+    public void setActivated(Integer activated) {
+        this.activated = activated;
+    }
+
+    public Integer getExpired() {
+        return expired;
+    }
+
+    public void setExpired(Integer expired) {
+        this.expired = expired;
+    }
+
+    public Integer getUsed() {
+        return used;
+    }
+
+    public void setUsed(Integer used) {
+        this.used = used;
+    }
+}