Skip to content

H
haoban-manage3.0
Commit 31e4214f by 墨竹
Options

Merge branch 'developer' 

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmQrcodeApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java
#	haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml
#	haoban-manage3-service/src/test/java/ServiceTest.java
parents 943d9c60 c17bcbbf
Showing with 2377 additions and 1134 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/constants/Manage3Constants.java
......@@ -18,4 +18,8 @@ public class Manage3Constants {
* 链接前缀
*/
public static final String DT = "DT";
/**
* 企微最大分页
*/
public static final Integer QW_LIMIT = 1000;
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ClerkStaffWxUserDTO.java
......@@ -17,7 +17,7 @@ public class ClerkStaffWxUserDTO implements Serializable {
/**
* 导购员工的外部联系人id-wxUserId
*/
private String staffWxUserId;
private String staffId;
/**
* 员工导购id
*/
......@@ -26,9 +26,9 @@ public class ClerkStaffWxUserDTO implements Serializable {
public ClerkStaffWxUserDTO() {
}
public ClerkStaffWxUserDTO(String staffWxUserId, String staffClerkId, String memberExternalUserId) {
public ClerkStaffWxUserDTO(String staffId, String staffClerkId, String memberExternalUserId) {
this.memberExternalUserId = memberExternalUserId;
this.staffWxUserId = staffWxUserId;
this.staffId = staffId;
this.staffClerkId = staffClerkId;
}
......@@ -40,12 +40,12 @@ public class ClerkStaffWxUserDTO implements Serializable {
this.memberExternalUserId = memberExternalUserId;
}
public String getStaffWxUserId() {
return staffWxUserId;
public String getStaffId() {
return staffId;
}
public void setStaffWxUserId(String staffWxUserId) {
this.staffWxUserId = staffWxUserId;
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffClerkId() {
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ExternalClerkRelatedDTO.java
......@@ -30,8 +30,6 @@ public class ExternalClerkRelatedDTO implements Serializable {
private String staffId;
private String wxUserId;
private Integer statusFlag;
private String relationKey;
......@@ -146,14 +144,6 @@ public class ExternalClerkRelatedDTO implements Serializable {
this.staffId = staffId == null ? null : staffId.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ExternalClerkRelatedShortInfoDTO.java
......@@ -4,9 +4,8 @@ import java.io.Serializable;
public class ExternalClerkRelatedShortInfoDTO implements Serializable {
private String externalUserId;
private String wxUserId;
private String staffId ;
private String enterpriseId;
private String wxEnterpriseId;
private String storeId;
......@@ -14,6 +13,14 @@ public class ExternalClerkRelatedShortInfoDTO implements Serializable {
private static final long serialVersionUID = 1L;
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStoreId() {
return storeId;
}
......@@ -53,12 +60,4 @@ public class ExternalClerkRelatedShortInfoDTO implements Serializable {
public void setExternalUserId(String externalUserId) {
this.externalUserId = externalUserId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MemberUnionidRelatedDTO.java
......@@ -25,8 +25,6 @@ public class MemberUnionidRelatedDTO implements Serializable{
private String externalUserid;
private String wxUserId;
private String selfExternalUserid;
private String externalName;
......@@ -44,7 +42,16 @@ public class MemberUnionidRelatedDTO implements Serializable{
* 自定义的state参数
*/
private String state;
private String staffId ;
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getWelcomeCode() {
return welcomeCode;
......@@ -102,14 +109,6 @@ public class MemberUnionidRelatedDTO implements Serializable{
this.externalUserid = externalUserid == null ? null : externalUserid.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public Date getCreateTime() {
return createTime;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/QwFrientNoticeDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
/**
*
* @ClassName: QwFrientNoticeDTO
* @Description: 企微加好友通知
* @author xugh
* @date 2022年8月18日 上午10:31:14
*
*/
public class QwFrientNoticeDTO implements Serializable{
private static final long serialVersionUID = 1L;
private String corpid;
private String suiteid;
private String memberUnionidRelatedId;
private String memberId;
private String unionid;
private String wxEnterpriseId;
private String enterpriseId;
private Integer statusFlag;
private String externalUserid;
private String wxUserId;
private String selfExternalUserid;
private String externalName;
private String addCreateTime;
private String avatar;
private String welcomeCode;
/**
* 自定义的state参数
*/
private String state;
private String staffId ;
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getWelcomeCode() {
return welcomeCode;
}
public void setWelcomeCode(String welcomeCode) {
this.welcomeCode = welcomeCode;
}
public String getMemberUnionidRelatedId() {
return memberUnionidRelatedId;
}
public void setMemberUnionidRelatedId(String memberUnionidRelatedId) {
this.memberUnionidRelatedId = memberUnionidRelatedId == null ? null : memberUnionidRelatedId.trim();
}
public String getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId == null ? null : memberId.trim();
}
public String getUnionid() {
return unionid;
}
public void setUnionid(String unionid) {
this.unionid = unionid == null ? null : unionid.trim();
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public String getExternalUserid() {
return externalUserid;
}
public void setExternalUserid(String externalUserid) {
this.externalUserid = externalUserid == null ? null : externalUserid.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
public String getSuiteid() {
return suiteid;
}
public void setSuiteid(String suiteid) {
this.suiteid = suiteid;
}
public String getSelfExternalUserid() {
return selfExternalUserid;
}
public void setSelfExternalUserid(String selfExternalUserid) {
this.selfExternalUserid = selfExternalUserid;
}
public String getExternalName() {
return externalName;
}
public void setExternalName(String externalName) {
this.externalName = externalName;
}
public String getAddCreateTime() {
return addCreateTime;
}
public void setAddCreateTime(String addCreateTime) {
this.addCreateTime = addCreateTime;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java
......@@ -13,8 +13,6 @@ public class StaffClerkRelationDTO implements Serializable {
private String wxEnterpriseId;
private String wxUserId;
private String enterpriseId;
private String storeId;
......@@ -32,9 +30,26 @@ public class StaffClerkRelationDTO implements Serializable {
private String storeName;
private String staffName;
private String wxOpenUserId;
private Integer openConcatFlag;
private String qwUserId ;
private String openUserId ;
public String getQwUserId() {
return qwUserId;
}
public String getOpenUserId() {
return openUserId;
}
public void setQwUserId(String qwUserId) {
this.qwUserId = qwUserId;
}
public void setOpenUserId(String openUserId) {
this.openUserId = openUserId;
}
public String getStaffClerkRelationId() {
return staffClerkRelationId;
......@@ -60,14 +75,6 @@ public class StaffClerkRelationDTO implements Serializable {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getEnterpriseId() {
return enterpriseId;
}
......@@ -140,14 +147,6 @@ public class StaffClerkRelationDTO implements Serializable {
this.staffName = staffName;
}
public String getWxOpenUserId() {
return wxOpenUserId;
}
public void setWxOpenUserId(String wxOpenUserId) {
this.wxOpenUserId = wxOpenUserId;
}
public Integer getOpenConcatFlag() {
if(null == openConcatFlag) {
return 1 ;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java
......@@ -99,6 +99,7 @@ public class StaffDTO implements Serializable {
private String clerkName;
private String defaultGicEid;
private Integer addNum;
private Integer activeStatus;
public String getDefaultGicEid() {
return defaultGicEid;
......@@ -373,4 +374,12 @@ public class StaffDTO implements Serializable {
public void setAddNum(Integer addNum) {
this.addNum = addNum;
}
public Integer getActiveStatus() {
return activeStatus;
}
public void setActiveStatus(Integer activeStatus) {
this.activeStatus = activeStatus;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDepartmentRelatedDTO.java
......@@ -12,8 +12,6 @@ public class StaffDepartmentRelatedDTO implements Serializable {
private String nationCode;
private String wxUserId;
private String wxEnterpriseId;
private String departmentId;
......@@ -62,14 +60,6 @@ public class StaffDepartmentRelatedDTO implements Serializable {
this.nationCode = nationCode == null ? null : nationCode.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getDepartmentId() {
return departmentId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java
......@@ -11,10 +11,8 @@ public class WxEnterpriseDTO implements Serializable {
private String wxEnterpriseId;
private String corpid;
private String permanentCode;
// 业务中请不要使用此属性
private String corpName;
private String corpType;
......@@ -104,8 +102,36 @@ public class WxEnterpriseDTO implements Serializable {
* 转换wx_userid状态：0:未转换；1:转换成功；2:转换中；3:转换失败
*/
private Integer useridFlag;
private Integer autoActiveFlag;
private String enterpriseId;
private Integer wxSecurityType ;
private String wxCorpid ;
private String openCorpid ;
public Integer getWxSecurityType() {
return wxSecurityType;
}
public void setWxSecurityType(Integer wxSecurityType) {
this.wxSecurityType = wxSecurityType;
}
public String getWxCorpid() {
return wxCorpid;
}
public String getOpenCorpid() {
return openCorpid;
}
public void setWxCorpid(String wxCorpid) {
this.wxCorpid = wxCorpid;
}
public void setOpenCorpid(String openCorpid) {
this.openCorpid = openCorpid;
}
public String getMemberSecret() {
return memberSecret;
......@@ -131,14 +157,6 @@ public class WxEnterpriseDTO implements Serializable {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid == null ? null : corpid.trim();
}
public String getPermanentCode() {
return permanentCode;
}
......@@ -451,6 +469,14 @@ public class WxEnterpriseDTO implements Serializable {
this.useridFlag = useridFlag;
}
public Integer getAutoActiveFlag() {
return autoActiveFlag;
}
public void setAutoActiveFlag(Integer autoActiveFlag) {
this.autoActiveFlag = autoActiveFlag;
}
public String getEnterpriseId() {
return enterpriseId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java
......@@ -5,19 +5,25 @@ import java.io.Serializable;
public class WxEnterpriseQwDTO implements Serializable {
private static final long serialVersionUID = 1L;
private int wxSecurityType ;
private int wxSecurityType;
private String wxEnterpriseId;
// 企业表中的id(正常同第三方)
private String corpid;
// 好办 助手
private String dkCorpid;
private String dkSuiteId ;
private String dkSuiteId;
// 会员小程序dk
private String memberCorpid;
private String memberSuiteId ;
private String memberSuiteId;
// 第三方
private String thirdCorpid;
// 第三方使用的加密的userid
public boolean needOpenUserId3th() {
return this.wxSecurityType == 2 || this.wxSecurityType == 3;
}
public boolean needOpenUserIdDk() {
return this.wxSecurityType == 2 || this.wxSecurityType == 4 ;
}
public String getDkSuiteId() {
return dkSuiteId;
......@@ -47,10 +53,6 @@ public class WxEnterpriseQwDTO implements Serializable {
return wxEnterpriseId;
}
public String getCorpid() {
return corpid;
}
public String getDkCorpid() {
return dkCorpid;
}
......@@ -67,10 +69,6 @@ public class WxEnterpriseQwDTO implements Serializable {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
public void setDkCorpid(String dkCorpid) {
this.dkCorpid = dkCorpid;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/fee/HaobanQywxFeeAccountInterceptLogDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.fee;
import java.io.Serializable;
import java.util.Date;
/**
* 企业微信账号拦截日志(TabHaobanQywxFeeAccountInterceptLog)实体类
*
* @author mozhu
* @since 2022-08-10 10:27:47
*/
public class HaobanQywxFeeAccountInterceptLogDTO implements Serializable {
private static final long serialVersionUID = -14545100741695880L;
private Long feeAccountInterceptId;
private String corpId;
private String wxEnterpriseId;
/**
* 用户id
*/
private String wxUserId;
/**
* 员工id
*/
private String staffId;
private Date qwCreateTime;
public Long getFeeAccountInterceptId() {
return feeAccountInterceptId;
}
public void setFeeAccountInterceptId(Long feeAccountInterceptId) {
this.feeAccountInterceptId = feeAccountInterceptId;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public Date getQwCreateTime() {
return qwCreateTime;
}
public void setQwCreateTime(Date qwCreateTime) {
this.qwCreateTime = qwCreateTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/fee/HaobanQywxFeeDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.fee;
import java.io.Serializable;
import java.util.Date;
/**
* 企业微信收费(TabHaobanQywxFee)实体类
*
* @author mozhu
* @since 2022-08-03 16:12:30
*/
public class HaobanQywxFeeDTO implements Serializable {
private static final long serialVersionUID = -65108900619188163L;
private Long qwFeeId;
private String corpName;
private String corpId;
private String wxEnterpriseId;
/**
* 拦截时间
*/
private Date interceptTime;
/**
* 拦截用户总数
*/
private Integer interceptUserNum;
/**
* 剩余可用许可
*/
private Integer permissionUserNum;
/**
* 购买许可总数
*/
private Integer buyPermissionUserNum;
/**
* 拦截：1:已拦截；0：将被拦截
*/
private Integer interceptFlag;
private Integer detailNum;
private Integer autoActiveFlag;
private String enterpriseNames;
public Long getQwFeeId() {
return qwFeeId;
}
public void setQwFeeId(Long qwFeeId) {
this.qwFeeId = qwFeeId;
}
public String getCorpName() {
return corpName;
}
public void setCorpName(String corpName) {
this.corpName = corpName;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Date getInterceptTime() {
return interceptTime;
}
public void setInterceptTime(Date interceptTime) {
this.interceptTime = interceptTime;
}
public Integer getInterceptUserNum() {
return interceptUserNum;
}
public void setInterceptUserNum(Integer interceptUserNum) {
this.interceptUserNum = interceptUserNum;
}
public Integer getPermissionUserNum() {
return permissionUserNum;
}
public void setPermissionUserNum(Integer permissionUserNum) {
this.permissionUserNum = permissionUserNum;
}
public Integer getBuyPermissionUserNum() {
return buyPermissionUserNum;
}
public void setBuyPermissionUserNum(Integer buyPermissionUserNum) {
this.buyPermissionUserNum = buyPermissionUserNum;
}
public Integer getInterceptFlag() {
return interceptFlag;
}
public void setInterceptFlag(Integer interceptFlag) {
this.interceptFlag = interceptFlag;
}
public Integer getDetailNum() {
return detailNum;
}
public void setDetailNum(Integer detailNum) {
this.detailNum = detailNum;
}
public Integer getAutoActiveFlag() {
return autoActiveFlag;
}
public void setAutoActiveFlag(Integer autoActiveFlag) {
this.autoActiveFlag = autoActiveFlag;
}
public String getEnterpriseNames() {
return enterpriseNames;
}
public void setEnterpriseNames(String enterpriseNames) {
this.enterpriseNames = enterpriseNames;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/fee/HaobanQywxFeeDetailDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.fee;
import java.io.Serializable;
import java.util.Date;
/**
* 企业微信收费(TabHaobanQywxFee)实体类
*
* @author mozhu
* @since 2022-08-03 16:12:30
*/
public class HaobanQywxFeeDetailDTO implements Serializable {
private static final long serialVersionUID = -65108900619188163L;
/**
* 拦截时间
*/
private Date interceptTime;
/**
* 拦截用户总数
*/
private Integer interceptUserNum;
public Date getInterceptTime() {
return interceptTime;
}
public void setInterceptTime(Date interceptTime) {
this.interceptTime = interceptTime;
}
public Integer getInterceptUserNum() {
return interceptUserNum;
}
public void setInterceptUserNum(Integer interceptUserNum) {
this.interceptUserNum = interceptUserNum;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmClerkRelationDTO.java
......@@ -15,9 +15,7 @@ public class HmClerkRelationDTO implements Serializable {
private Long relationId;
private Long hmId;
private String wxUserId;
private String wxEnterpriseId;
private String enterpriseId;
......@@ -64,14 +62,6 @@ public class HmClerkRelationDTO implements Serializable {
this.hmId = hmId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmQrcodeDTO.java
......@@ -68,9 +68,7 @@ public class HmQrcodeDTO implements Serializable {
* 微信联系我二维码
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
private String storeName;
......@@ -262,14 +260,6 @@ public class HmQrcodeDTO implements Serializable {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/QywxFeeListQDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.qdto;
import com.gic.haoban.base.api.common.BasePageInfo;
import java.io.Serializable;
/**
* qywx qdto费用列表
*
* @author mozhu
* @date 2022-08-05 15:15:15
*/
public class QywxFeeListQDTO extends BasePageInfo implements Serializable {
private static final long serialVersionUID = 6652319673885815810L;
private String searchName;
private String wxEnterpriseId;
private String startDate;
private String endDate;
private Integer interceptFlag;
public String getSearchName() {
return searchName;
}
public void setSearchName(String searchName) {
this.searchName = searchName;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public Integer getInterceptFlag() {
return interceptFlag;
}
public void setInterceptFlag(Integer interceptFlag) {
this.interceptFlag = interceptFlag;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmClerkRelationQDTO.java
......@@ -17,8 +17,6 @@ public class HmClerkRelationQDTO implements Serializable {
private Long hmId;
private String wxUserId;
private String wxEnterpriseId;
private String enterpriseId;
......@@ -69,14 +67,6 @@ public class HmClerkRelationQDTO implements Serializable {
this.hmId = hmId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmQrcodeQDTO.java
......@@ -70,9 +70,7 @@ public class HmQrcodeQDTO implements Serializable {
* 微信联系我二维码
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
private String storeName;
......@@ -270,14 +268,6 @@ public class HmQrcodeQDTO implements Serializable {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/WxUserAddLogQDTO.java
......@@ -14,7 +14,6 @@ public class WxUserAddLogQDTO implements Serializable{
private Long hmId;
private boolean delFlag;
private String externalUserid;
private String wxUserId;
private String staffId;
private String staffName;
private String clerkId;
......@@ -51,10 +50,6 @@ public class WxUserAddLogQDTO implements Serializable{
return externalUserid;
}
public String getWxUserId() {
return wxUserId;
}
public String getStaffId() {
return staffId;
}
......@@ -95,10 +90,6 @@ public class WxUserAddLogQDTO implements Serializable{
this.externalUserid = externalUserid;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AlertTypeEnum.java
......@@ -11,6 +11,7 @@ public enum AlertTypeEnum {
ES_BID_PAGE(5, "es查询存在大分页", "https://oapi.dingtalk.com/robot/send?access_token=04b381d2b95816d28ed37c73d300537cbd2e67dc6670258ab85a6b3ef227d3b3"),
GET_NEW_EXTERNAL_USERID(6, "转换外部联系人id", null),
WEWORK_PAY(7, "向员工付款", null),
FEE_ALARM(8, "30天后接口许可证即将到期", "https://oapi.dingtalk.com/robot/send?access_token=8bff312a35700ae99a4b8a26d90038fe6bddc5e3e6a0a0d348c9c84c0473979a"),
;
private Integer type;
private String name;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SecretTypeEnum.java
......@@ -5,10 +5,6 @@ package com.gic.haoban.manage.api.enums;
*/
public enum SecretTypeEnum {
CONTACT_CUSTOMER(1, "顾客联系"),
// 2和3废弃
CONTACT_SECRET(2, "通讯录"),
// 3和5公用
HAOBAN_HELP(3, "好办助手"),
MEMBER_WAPP(4, "会员小程序"),
CUSTOMIZED_APP(5, "自建代开发"),
WEWORK_PAY(6, "企业支付"),
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SyncTaskTypeEnum.java
......@@ -7,7 +7,8 @@ public enum SyncTaskTypeEnum {
QYWX_CONTACT(1, "后门同步企业微信架构"),
FRIEND_SINGLE(4, "单个成员刷新好友"),
FRIEND_STORE(5, "刷新门店好友"),
MEMBER_TAG(6, "企业微信标签刷新");
MEMBER_TAG(6, "企业微信标签刷新"),
FRIEND_WX_ENTEPRISE(10, "企业好友初始化");
private int type;
private String taskName;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/response/SendSmsResponse.java 0 → 100644
package com.gic.haoban.manage.api.response;
import java.io.Serializable;
public class SendSmsResponse implements Serializable {
/**
* 是否成功
*/
private boolean isSuccess;
/**
* 错误信息
*/
private String message;
public boolean isSuccess() {
return isSuccess;
}
public void setSuccess(boolean isSuccess) {
this.isSuccess = isSuccess;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java
......@@ -54,12 +54,6 @@ public interface DepartmentApiService {
* @return
*/
DepartmentDTO selectByRelatedId(String departId);
/**
* 放入回收站
* @param departmentId
* @return
*/
ServiceResponse recycle(String departmentId);
/**
* 根据参数查询
......@@ -72,11 +66,7 @@ public interface DepartmentApiService {
*/
Page<DepartmentDTO> pageDepartmentByParams(BasePageInfo pageInfo, String wxEnterpriseId, String keyword,
Integer storeFlag, Integer recycleFlag);
/**
* 回收站恢复
* @param departmentId
*/
ServiceResponse repairRecycle(String departmentId,String parentId);
/**
* 获取根节点
* @param wxEnterpriseId
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
package com.gic.haoban.manage.api.service;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.ServiceResponse;
......@@ -8,10 +12,6 @@ import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
import com.gic.haoban.manage.api.dto.FriendMemberStatusDTO;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* Created by tgs on 2020/2/9.
......@@ -19,16 +19,6 @@ import java.util.Map;
public interface ExternalClerkRelatedApiService {
/**
* 查询导购好友关联
*
* @param wxUserId : 微信用户id
* @param wxEnterpriseId : 微信企业id
* @param enterpriseId : 企业id
* @return : 返回好友关联
*/
List<ExternalClerkRelatedDTO> listByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId, String enterpriseId);
/**
* 查询会员在企业下的好友关系
*
* @param memberId : 会员id
......@@ -37,17 +27,12 @@ public interface ExternalClerkRelatedApiService {
* @return : 返回会员导购关联关系
*/
List<ExternalClerkRelatedDTO> listByMemberIdAndWxEnterpriseId(String memberId, String wxEnterpriseId, String enterpriseId);
List<ExternalClerkRelatedDTO> listByMemberIdList(List<String> memberIdList, String wxEnterpriseId, String enterpriseId);
@Deprecated
List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
@Deprecated
Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
String enterpriseId, BasePageInfo pageInfo);
List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String wxUserId, String wxEnterpriseId);
List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String staffId, String wxEnterpriseId);
List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> userIdList, String wxEnterpriseId);
List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> staffIdList, String wxEnterpriseId);
/**
* 根据关联key查询待关联的记录-触达待完善记录
......@@ -70,6 +55,14 @@ public interface ExternalClerkRelatedApiService {
* @return
*/
boolean pushExternalByRelationKey(String relationKey);
@Deprecated
List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
@Deprecated
Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
String enterpriseId, BasePageInfo pageInfo);
/**
* 推送外部联系人 更新次数以及状态（会员回调-绑定好友）
......@@ -107,7 +100,7 @@ public interface ExternalClerkRelatedApiService {
*
* @return
*/
ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId);
ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String staffId, String enterpriseId, String externalUserId);
/**
* 根据id查询列表
......@@ -143,23 +136,6 @@ public interface ExternalClerkRelatedApiService {
List<String> listExternalClerkMemberIdsByMemberIds(String wxEnterpriseId, List<String> memberIds);
/**
* 获取企业下的关联关系列表
*
* @return
*/
List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberIds(String wxEnterpriseId, List<String> memberIds);
/**
* 这个是所有企业下的会员关联关系 性能很差
* 获取会员下的关联关系列表
* @param memberId
* @return
*/
@Deprecated
List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId);
/**
* 通过会员id查询好友门店id
*
* @param memberId 成员身份
......@@ -179,6 +155,15 @@ public interface ExternalClerkRelatedApiService {
* @date 2022-03-29 10:19:24
*/
List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId,String enterpriseId);
/**
* 这个是所有企业下的会员关联关系 性能很差
* 获取会员下的关联关系列表
* @param memberId
* @return
*/
@Deprecated
List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId);
/**
......@@ -234,7 +219,7 @@ public interface ExternalClerkRelatedApiService {
* @param clerkId
* @return
*/
int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String wxUserId, String clerkId);
int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String staffId, String clerkId);
/**
......@@ -269,7 +254,7 @@ public interface ExternalClerkRelatedApiService {
* @author mozhu
* @date 2022-03-11 15:23:13
*/
ExternalClerkRelatedDTO getByWxEnterpriseIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid);
ExternalClerkRelatedDTO getByWxEnterpriseIdAndUnionId(String wxEnterpriseId, String staffId, String unionid);
/**
......@@ -293,5 +278,16 @@ public interface ExternalClerkRelatedApiService {
* @date 2022-04-15 16:57:30
*/
FriendMemberStatusDTO getFriendMemberStatus(String memberId,String enterpriseId);
/**
*
* @Title: initWxEnterpriseFrient
* @Description: 初始化整个商户的好友
* @author xugh
* @param wxEnterpriseId
* @throws
*/
void initWxEnterpriseFriend(String wxEnterpriseId) ;
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HandoverOperationApiService.java
......@@ -32,14 +32,6 @@ public interface HandoverOperationApiService {
public void dealQywxEnterpriseHandoverMq(String wxEnterpriseId);
/**
* 定时处理企业微信 离职基础的结果（废弃）
*
* @param params
*/
@Deprecated
public void BatchQywxHandoverResultTimeTask(String params);
/**
* 处理企业微信信息
*
* @param wxEnterpriseId
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java
package com.gic.haoban.manage.api.service;
import java.util.List;
import com.gic.api.base.commons.JSONResponse;
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 java.util.Date;
import java.util.List;
import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
import com.gic.haoban.manage.api.dto.ExternalUserDTO;
import com.gic.haoban.manage.api.dto.FriendStoreInfoDTO;
import com.gic.haoban.manage.api.dto.MemberStoreDTO;
import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
import com.gic.haoban.manage.api.dto.QwFrientNoticeDTO;
public interface MemberUnionidRelatedApiService {
......@@ -18,9 +20,7 @@ public interface MemberUnionidRelatedApiService {
* @param memberId : 会员id
* @return : 返回导购与会员关联关系
*/
ExternalClerkRelatedDTO getByWxUserIdMemberId(String wxUserId, String memberId);
MemberUnionidRelatedDTO getByUnionId(String staffId, String unionid);
ExternalClerkRelatedDTO getByWxUserIdMemberId(String staffId, String memberId);
/**
* 外部联系人新增（加好友）
......@@ -28,21 +28,21 @@ public interface MemberUnionidRelatedApiService {
* @param dto
* @return
*/
String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
String addMemberUnionidRelated(QwFrientNoticeDTO dto);
/**
* 外部联系人删除（删好友）
*
* @param dto
*/
void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
void delMemberUnionidRelated(QwFrientNoticeDTO dto);
/**
* 外部联系人新增（修改好友）
*
* @param dto
*/
void editMemberUnionidRelated(MemberUnionidRelatedDTO dto);
void editMemberUnionidRelated(QwFrientNoticeDTO dto);
/**
* 处理外部联系人异步
......@@ -54,10 +54,6 @@ public interface MemberUnionidRelatedApiService {
ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId);
List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
/**
* 查看是否可以跳转会员详情的会员列表
*
......@@ -66,26 +62,10 @@ public interface MemberUnionidRelatedApiService {
* @param storeId
* @return
*/
List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId, String storeId);
@Deprecated
String add(String wxEnterpriseId, String selfExternalUserId, String userId1, String storeId);
/**
* 刷新企微好友
*
* @param wxEnterpriseId
* @param wxUserId
* @param storeId
*/
void freshWxFrend(String wxEnterpriseId, String wxUserId, String storeId);
List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String staffId, String storeId);
void cleanByCid(String cid);
Page<MemberUnionidRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
String enterpriseId, BasePageInfo pageInfo);
/**
* 群发助手发送企业微信消息
*
......@@ -97,7 +77,7 @@ public interface MemberUnionidRelatedApiService {
* @author mozhu
* @date 2022-01-13 10:50:44
*/
String sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, String materialId);
String sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, String materialId);
/**
* 创建企业群发, 支出素材批量发送
......@@ -108,7 +88,7 @@ public interface MemberUnionidRelatedApiService {
* @param materialIdList : 素材id列表
* @return : 返回群发执行结果
*/
JSONResponse sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, List<String> materialIdList);
JSONResponse sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, List<String> materialIdList);
/**
* 获取群发成员发送任务列表
......@@ -133,8 +113,6 @@ public interface MemberUnionidRelatedApiService {
JSONResponse getMessageStatus(String wxEnterpriseId, String wxMessageId);
List<MemberUnionidRelatedDTO> getByWxUserIdListAndWxEnterpriseId(List<String> userIdList, String wxEnterpriseId);
/**
* 添加好友
*
......@@ -143,25 +121,7 @@ public interface MemberUnionidRelatedApiService {
* @author mozhu
* @date 2021-12-13 17:12:39
*/
String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
/**
* 刷新企微好友
*
* @param res
*/
@Deprecated
void mqFreshWxFrend(String res);
/**
* 清楚不存在的好友关系
*
* @param wxEnterpriseId
* @param wxUserId
* @param resWes
*/
@Deprecated
void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String resWes);
String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId);
/**
* 客户列表-自建
......@@ -190,6 +150,8 @@ public interface MemberUnionidRelatedApiService {
* @return
*/
ExternalUserDTO getCorpSelfExternalUseridInfo(String wxEnterpriseId, String wxUserId, String externalUserId);
ExternalUserDTO getCorpSelfExternalUseridInfoForMember(String wxEnterpriseId, String wxUserId, String externalUserId,String enterpriseId);
/**
* 添加企微好友关联关系表-无需触达
......@@ -224,7 +186,7 @@ public interface MemberUnionidRelatedApiService {
* @param wxUserId
* @param externalUserIds
*/
void cleanNoExsitFriendNew(String wxEnterpriseId, String wxUserId, List<String> externalUserIds);
void cleanNoExsitFriendNew(String wxEnterpriseId, String staffId, List<String> externalUserIds);
/**
* 根据会员的unionid 获取好友导购列表
......@@ -235,16 +197,6 @@ public interface MemberUnionidRelatedApiService {
*/
ServiceResponse<List<FriendStoreInfoDTO>> listFriendClerkByMemberUnionid(String enterpriseId, String unionId);
/**
* 根据企业内部外部联系人id 获取关联关系
*
* @param wxEnterpriseId
* @param wxUserId
* @param selfExternalUserId
* @return
*/
MemberUnionidRelatedDTO getExternalUseridInfoBySelfExternalUserId(String wxEnterpriseId, String wxUserId, String selfExternalUserId);
/**
* 根据企业内部外部联系人id 获取关联关系
......@@ -281,19 +233,6 @@ public interface MemberUnionidRelatedApiService {
/**
* 根据unionid查询导购好友
*
* @param wxEnterpriseId wx企业标识
* @param wxUserId wx用户id
* @param unionid unionid
* @return {@link MemberUnionidRelatedDTO }
* @author mozhu
* @date 2022-03-11 15:41:09
*/
MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid);
/**
* 根据id查询
*
* @param memberUnionidRelatedId 成员unionid相关id
......@@ -314,26 +253,5 @@ public interface MemberUnionidRelatedApiService {
*/
void updateSelfExternalUseridById(String selfExternalUserid, String memberUnionidRelatedId);
/**
* 更新新userid corpid
*
* @param wxEnterpriseId wx企业标识
* @return {@link ServiceResponse }
* @author mozhu
* @date 2022-06-30 13:54:12
*/
ServiceResponse updateNewUseridCorpid(String wxEnterpriseId);
/**
* 更新新userid corpid mq
* "routerName": "updateNewUseridCorpidMq"
*
* @param params 参数个数
* @author mozhu
* @date 2022-06-30 13:56:27
*/
void updateNewUseridCorpidMq(String params);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java
......@@ -68,11 +68,11 @@ public interface MessageApiService {
* 获取新的微信用户id
*
* @param wxEnterpriseId 微信企业id
* @param wxUserId 微信用户id
* @param staffId 微信用户id
* @return {@link String }
* @author mozhu
* @date 2022-03-10 13:48:10
*/
String getNewWxUserId(String wxEnterpriseId, String wxUserId);
String getNewWxUserIdByStaffId(String wxEnterpriseId, String staffId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
......@@ -11,24 +11,15 @@ public interface StaffApiService {
StaffDTO selectById(String staffId);
StaffDTO selectSuperByWxEnterpriseId(String wxEnterpriseId);
List<StaffDTO> listByIds(List<String> staffIds);
List<StaffDTO> listByWxUserId(String wxUserId, String wxEnterpriseId);
StaffDTO selectByNationcodeAndPhoneNumber(String wxEnterpriseId, String nationcode, String phoneNumber);
ServiceResponse add(StaffDTO staff, String departmentIds);
List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
Page<StaffDTO> pageStaff(List<String> departmentId, Integer activeFlag,
String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId);
@Deprecated
void del(String staffDepartmentStaffRelatedId);
/**
* 保存微信成员
*
......@@ -76,39 +67,18 @@ public interface StaffApiService {
StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
int countByDepartmentId(String departmentId);
@Deprecated
void syncGicClerk(String fieldListString);
@Deprecated
void addGicClerk(GicClerkDTO clerkDTO);
StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId, String taskId);
List<String> listUnBindClerk(String storeId);
@Deprecated
void cleanGicClerk(String clerkCode, String departmentId);
String insertUserLoginLog(UserLoginLogDTO userLoginLogDTO);
int countByDepartmentIds(List<String> departmentIds);
List<StaffDTO> listByPhoneNumber(String phoneNumber);
List<StaffDTO> listByUserIdsAndWxEnterpriseId(List<String> userIds, String wxEnterpriseId);
/**
* 保存gic成员
*
* @param clerkDTO
* @return
*/
ServiceResponse saveSyncStaffByGic(GicClerkDTO clerkDTO);
/**
* 获取成员头像
*
......@@ -120,7 +90,7 @@ public interface StaffApiService {
void wxFristAdd(String userJson, String wxEnterpriseId);
List<String> listBindClerkUserId(String storeId);
List<String> listBindStaffId(String storeId);
List<StaffClerkRelationDTO> listBindRelationUserId(String storeId);
......@@ -133,23 +103,6 @@ public interface StaffApiService {
boolean activeStaff(String staffId);
/**
* 获取一个staff
*
* @param wxEnterpriseId
* @return
*/
StaffDTO getWxStaffOne(String wxEnterpriseId);
/**
* 获取超管
*
* @param wxEnterpriseId
* @return
*/
StaffDTO getAndAddSupperAdmin(String wxEnterpriseId);
/**
* 是否隐私
*
* @param staffId 员工id
......@@ -308,16 +261,4 @@ public interface StaffApiService {
*/
List<String> getHaoBanStoreRolesByEnterpriseId(String enterpriseId, String wxEnterpriseId);
/**
* 更新userid by open_userid
*
* @param wxEnterpriseId wx企业标识
* @param wxOpenUseId wx开放使用id
* @param wxUserId wx用户id
* @return int
* @author mozhu
* @date 2022-07-18 19:06:27
*/
int updateWxUserIdsByWxOpenUserId(String wxEnterpriseId, String wxOpenUseId,String wxUserId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java
......@@ -10,6 +10,8 @@ import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import java.util.List;
import java.util.Set;
import org.apache.ibatis.annotations.Param;
public interface StaffClerkRelationApiService {
/**
* 绑定日志
......@@ -93,13 +95,15 @@ public interface StaffClerkRelationApiService {
* @return
*/
StaffClerkRelationDTO getByClerkId(String clerkId);
StaffClerkRelationDTO getByClerkIdForWxUserId(String clerkId);
/**
* @param enterpriseId
* @param wxUserId
* @return
*/
List<StaffClerkRelationDTO> listByEnterpriseIdAndWxUserId(String enterpriseId, String wxUserId);
List<StaffClerkRelationDTO> listByEnterpriseIdAndStaffid(String enterpriseId, String staffid);
/**
* 删除关联关系
......@@ -161,14 +165,6 @@ public interface StaffClerkRelationApiService {
Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo);
/**
* 查询状态正常导购
*
* @return
*/
List<StaffClerkRelationDTO> listAll();
/**
* 通过员工id列表
*
* @param wxEnterpriseId wx企业标识
......@@ -212,5 +208,7 @@ public interface StaffClerkRelationApiService {
* @throws
*/
int getCanAddHmCount(String enterpriseId , String wxEnterpriseId , String clerkId) ;
List<String> listStaffIdByWxEnterpriseId(String wxEnterpriseId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/SyncHaobanToGicApiService.java 0 → 100644
package com.gic.haoban.manage.api.service;
public interface SyncHaobanToGicApiService {
/**
* 删除gicClerkId
* @param gicClerkId
*/
public void delGicClerk(String gicClerkId);
/**
* 同步gicClerkName
* @param gicClerkId
* @param name
*/
public void updateGicClerk(String gicClerkId,String name);
/**
* 判断gicClerk是否能新增
* @param gicEnterpriseId
* @param phoneNumber
* @param code
* @param gicStoreId
* @return
*/
public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId);
/**
*
* @param gicClerkId
* @param gicOldStoreId
* @param gicNewStoreId
* @param clerkChangeReason 1后台操作2订单操作3企业操作4app转岗
* @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);
/**
* 切换店长
* @param gicEnterpriseId
* @param gicStoreId
* @param gicClerkId
* @return
*/
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);
String syncClerkToGicClerkAddNew(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 0 → 100644
package com.gic.haoban.manage.api.service;
import com.gic.haoban.manage.api.response.SendSmsResponse;
/**
* Created by Administrator on 2018/3/22.
*/
public interface ValidationCodeApiService {
/**
* 短信验证码
*
* @param phoneNumber
* @param code
*/
int smsValidationCode(String phoneNumber, String code);
/**
* 短信验证码
*
* @param nationCode
* @param phoneNumber
* @param code
*/
int smsValidationCode(String nationCode,String phoneNumber, String code);
SendSmsResponse sendValidationCode(String nationCode, String phoneNumber, String code);
/**
* 语音验证码
*
* @param phoneNumber
* @param code
* @return
*/
int verifyValidationCode(String phoneNumber, String code);
/**
*
* @param nationCode
* @param phoneNumber
* @param unReadPeople
* @param unReadCount
* @return
*/
int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unReadPeople,String unReadCount,String enterpriseId);
/**
* 发送验证码
*
* @param nationCode
* @param phoneNumber
* @param code
* @param enterpriseId
* @param storeId
* @param clerkId
* @return
*/
SendSmsResponse sendValidationCodeHb3(String nationCode, String phoneNumber, String code, String enterpriseId, String storeId, String clerkId, boolean payFlag);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java
......@@ -45,6 +45,8 @@ public interface WxEnterpriseApiService {
* @return
*/
WxEnterpriseDTO getOne(String wxEnterpriseId);
WxEnterpriseQwDTO getQwInfo(String wxEnterpriseId);
/**
* 根据corpId查询一条数据
......@@ -217,6 +219,10 @@ public interface WxEnterpriseApiService {
*/
SecretSettingDTO getSecretSettingById(String secretId);
public void updateWxSecurityType(String wxEnterpriseId) ;
public int calcSecretType(String wxEnterpriseId) ;
/**
*
* @Title: stopHaoban
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/fee/HaobanQywxFeeApiService.java 0 → 100644
package com.gic.haoban.manage.api.service.fee;
import com.gic.api.base.commons.Page;
import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDTO;
import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDetailDTO;
import com.gic.haoban.manage.api.dto.qdto.QywxFeeListQDTO;
import java.util.List;
/**
* 企业微信收费(TabHaobanQywxFee)表服务接口
*
* @author mozhu
* @since 2022-08-03 16:12:30
*/
public interface HaobanQywxFeeApiService {
/**
* 插入
* 定时任务
*
* @param param 参数
* @author mozhu
* @date 2022-08-03 17:28:56
*/
void run(String param);
/**
* "routerName": "qywxAddFeeMq"
*
* @param wxEnterpriseId wx企业id
* @author mozhu
* @date 2022-08-11 14:38:50
*/
void addFee(String wxEnterpriseId);
/**
* 列表页面
*
* @param qywxFeeListQDTO qywx qdto费用列表
* @return {@link Page }
* @author mozhu
* @date 2022-08-05 15:17:18
*/
Page<HaobanQywxFeeDTO> listPage(QywxFeeListQDTO qywxFeeListQDTO);
/**
* 30天拦截详情
*
* @param wxEnterpriseId wx企业标识
* @return {@link List }
* @author mozhu
* @date 2022-08-05 15:17:20
*/
List<HaobanQywxFeeDetailDTO> feeDetail(String wxEnterpriseId);
/**
* 添加拦截记录
*
* @param param 参数
* @author mozhu
* @date 2022-08-10 11:01:56
*/
void addInterceptLog(String param);
/**
* 最新一条将要被拦截记录
*
* @param wxEnterpriseId wx企业标识
* @return {@link HaobanQywxFeeDTO }
* @author mozhu
* @date 2022-08-10 17:56:39
*/
HaobanQywxFeeDTO queryByWxEnterpriseId(String wxEnterpriseId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmQrcodeApiService.java
......@@ -124,10 +124,12 @@ public interface HmQrcodeApiService {
/**
* 检查员工开启联系我
* <p>
* "routerName": "checkStaffOpenContactByWxEnterpriseIdMq"
*
* @param param 参数
* @author mozhu
* @date 2022-08-19 15:04:37
* @date 2022-08-19 15:18:29
*/
void checkStaffOpenContactByWxEnterpriseId(String param);
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/mq/MemberUnionRelateConsumer.java deleted 100644 → 0
package com.gic.haoban.manage.api.service.mq;
/**
* desc：微信会员消费服务
*
* @author: YongEn
* @date: 2022/2/16
**/
public interface MemberUnionRelateConsumer {
/**
* desc: 添加好友关系-存量会员新增
*
* @param messageParam 消息参数
* @author : YongEn
* @date : 2022/2/16
*/
void addMemberUnionRelate(String messageParam);
}
haoban-manage3-operation-web/pom.xml
......@@ -96,28 +96,11 @@
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-contacts-api</artifactId>
<version>${haoban-contacts-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-manage3-api</artifactId>
<version>${haoban-manage3-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-manage-api</artifactId>
<version>${haoban-manage-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-contacts-manage-api</artifactId>
<version>${haoban-contacts-manage-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-operation-api</artifactId>
<version>${haoban-operation-api}</version>
</dependency>
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java
package com.gic.haoban.manage.web.controller;
import cn.hutool.core.collection.CollectionUtil;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.commons.util.GlobalVar;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.dto.PowerStoreGroupDTO;
......@@ -18,39 +41,34 @@ import com.gic.haoban.app.customer.service.api.service.QywxTagSyncApiService;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.PageResult;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.common.utils.UuidUtil;
import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.dto.BindStoreInfoDTO;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.StoreOrGroupInfoDTO;
import com.gic.haoban.manage.api.dto.StoreRangeInfoDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.service.*;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.qo.WxEnterpriseBindQo;
import com.gic.haoban.manage.web.vo.EnterpriseDetailVo;
import com.gic.haoban.manage.web.vo.EnterpriseSearchVO;
import com.gic.haoban.manage.web.vo.StoreGroupVo;
import com.gic.haoban.task.manage.api.service.GroupSendOperateApiService;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollectionUtil;
@RestController
public class EnterpriseController extends WebBaseController {
......@@ -76,11 +94,7 @@ public class EnterpriseController extends WebBaseController {
@Autowired
private QywxUserApiService qywxUserApiService;
@Autowired
private GroupSendOperateApiService groupSendOperateApiService;
@Autowired
private StoreGroupService storeGroupService ;
@Autowired
private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
private static final String QYWX_TAG_OPRN_KEY = "qywx-tag-open";
private static final String QYWX_TAG_OPRN_KEY_LOCK = "qywx-tag-open-lock";
......@@ -460,31 +474,6 @@ public class EnterpriseController extends WebBaseController {
}
}
/**
* desc: 发送会员关联消息
*
* @param wxEnterpriseId 微信企业id
* @return : {@link HaobanResponse}
* @author : YongEn
* @date : 2022/2/17
*/
@RequestMapping("/send-stock-member-relation-message")
public HaobanResponse sendMass(String wxEnterpriseId) {
if (StringUtils.isEmpty(wxEnterpriseId)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
// 处理缓存
String key = String.format(MEMBER_RELATE_ENT_OPE_KEY, wxEnterpriseId);
String cacheString = RedisUtil.getCache(key, String.class);
if (StringUtils.isNotEmpty(cacheString)) {
return resultResponse(HaoBanErrCode.ERR_40001);
}
RedisUtil.setCache(key, "1", 60 * 60 * 24 * 7L);
// 异步调用
groupSendOperateApiService.sendStockMemberRelationMessage(wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_1);
}
// 绑定门店列表
@RequestMapping("bind-store-list")
public HaobanResponse bindStoreList(String wxEnterpriseId,String enterpriseId, String search, BasePageInfo basePageInfo) {
......@@ -637,22 +626,4 @@ public class EnterpriseController extends WebBaseController {
WxEnterpriseRelationDetailDTO bindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, enterpriseId);
return resultResponse(HaoBanErrCode.ERR_1, bindInfo);
}
/**
* 转换corpid、userid、external_userid
* @param wxEnterpriseId
* @return
*/
@RequestMapping("/updateNewUseridCorpid")
public HaobanResponse updateNewUseridCorpid(String wxEnterpriseId) {
ServiceResponse serviceResponse = memberUnionidRelatedApiService.updateNewUseridCorpid(wxEnterpriseId);
int code = serviceResponse.getCode();
if (HaoBanErrCode.ERR_1.getCode() == code) {
return resultResponse(HaoBanErrCode.ERR_1);
} else {
String message = serviceResponse.getMessage();
return resultResponse(HaoBanErrCode.ERR_0, message);
}
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/PayController.java
......@@ -133,7 +133,7 @@ public class PayController extends WebBaseController {
StaffClerkRelationDTO relationDTO = maps.get(wxClerkInfoVO.getClerkId());
if (null!=relationDTO) {
wxClerkInfoVO.setStaffId(relationDTO.getStaffId());
wxClerkInfoVO.setWxUserId(relationDTO.getWxUserId());
wxClerkInfoVO.setWxUserId(relationDTO.getQwUserId());
}
});
}
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/QywxErrorLogController.java deleted 100644 → 0
package com.gic.haoban.manage.web.controller;
import com.gic.api.base.commons.Page;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.manage.api.dto.QywxErrorLogDTO;
import com.gic.haoban.manage.api.dto.qdto.QywxErrorLogListQDTO;
import com.gic.haoban.manage.api.service.QywxErrorLogApiService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* @author mozhu
* @date 2022/4/19 14:27
*/
@RestController
@RequestMapping("/qywx-error")
public class QywxErrorLogController extends WebBaseController {
@Autowired
private QywxErrorLogApiService qywxErrorLogApiService;
/**
* 企微报错列表
* @param qywxErrorLogListQDTO
* @return
*/
@RequestMapping(value = "qywx-error-list", method = RequestMethod.POST)
public RestResponse wxEnterpriseListNew(QywxErrorLogListQDTO qywxErrorLogListQDTO) {
Page<QywxErrorLogDTO> qywxErrorLogDTOPage = qywxErrorLogApiService.queryListByPage(qywxErrorLogListQDTO);
return RestResponse.successResult(qywxErrorLogDTOPage);
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/QywxManageController.java 0 → 100644
package com.gic.haoban.manage.web.controller;
import com.gic.api.base.commons.Page;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.manage.api.dto.QywxErrorLogDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDTO;
import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDetailDTO;
import com.gic.haoban.manage.api.dto.qdto.QywxErrorLogListQDTO;
import com.gic.haoban.manage.api.dto.qdto.QywxFeeListQDTO;
import com.gic.haoban.manage.api.service.QywxErrorLogApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author mozhu
* @date 2022/4/19 14:27
*/
@RestController
@RequestMapping("/qywx")
public class QywxManageController extends WebBaseController {
@Autowired
private QywxErrorLogApiService qywxErrorLogApiService;
@Autowired
private HaobanQywxFeeApiService haobanQywxFeeApiService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
/**
* 企微报错列表
*
* @param qywxErrorLogListQDTO
* @return
*/
@RequestMapping(value = "qywx-error-list", method = RequestMethod.POST)
public RestResponse qywxErrorList(QywxErrorLogListQDTO qywxErrorLogListQDTO) {
Page<QywxErrorLogDTO> qywxErrorLogDTOPage = qywxErrorLogApiService.queryListByPage(qywxErrorLogListQDTO);
return RestResponse.successResult(qywxErrorLogDTOPage);
}
/**
* 接口许可拦截管理列表
*
* @param qywxFeeListQDTO
* @return
*/
@RequestMapping(value = "qywx-fee-list", method = RequestMethod.POST)
public RestResponse qywxFeeList(@RequestBody QywxFeeListQDTO qywxFeeListQDTO) {
Page<HaobanQywxFeeDTO> listPage = haobanQywxFeeApiService.listPage(qywxFeeListQDTO);
List<HaobanQywxFeeDTO> result = listPage.getResult();
if (CollectionUtils.isNotEmpty(result)) {
for (HaobanQywxFeeDTO haobanQywxFeeDTO : result) {
String wxEnterpriseId = haobanQywxFeeDTO.getWxEnterpriseId();
WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
if (wxEnterpriseDTO != null) {
haobanQywxFeeDTO.setAutoActiveFlag(wxEnterpriseDTO.getAutoActiveFlag());
}
List<HaobanQywxFeeDetailDTO> haobanQywxFeeDetailDTOS = haobanQywxFeeApiService.feeDetail(wxEnterpriseId);
haobanQywxFeeDTO.setDetailNum(CollectionUtils.isEmpty(haobanQywxFeeDetailDTOS) ? 0 : haobanQywxFeeDetailDTOS.size());
}
listPage.setResult(result);
}
return RestResponse.successResult(listPage);
}
/**
* 拦截查看详情
*
* @param wxEnterpriseId
* @return
*/
@RequestMapping(value = "qywx-fee-detail", method = RequestMethod.GET)
public RestResponse qywxFeeDetail(String wxEnterpriseId) {
List<HaobanQywxFeeDetailDTO> haobanQywxFeeDetailDTOS = haobanQywxFeeApiService.feeDetail(wxEnterpriseId);
if (CollectionUtils.isEmpty(haobanQywxFeeDetailDTOS)) {
return RestResponse.successResult();
}
return RestResponse.successResult(haobanQywxFeeDetailDTOS);
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java
package com.gic.haoban.manage.web.controller.test;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.GICMQClientUtil;
......@@ -8,27 +20,17 @@ import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.enums.QuartzEnum;
import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.TestApiService;
import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
import com.gic.haoban.manage.web.controller.WebBaseController;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.task.manage.api.service.GroupSendOperateApiService;
import com.gic.member.tag.api.service.MemberTagImportDealService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.sharing.core.service.api.service.MqApiService;
import com.task.allocation.qo.AllocationTaskQo;
import com.task.allocation.qo.TaskAllocationComputed;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.stream.Collectors;
import static org.slf4j.LoggerFactory.getLogger;
/**
* Created 2018/12/17.
......@@ -54,9 +56,10 @@ public class TestController extends WebBaseController {
@Autowired
private MemberTagImportDealService memberTagImportDealService;
@Autowired
private GroupSendOperateApiService groupSendOperateApiService;
private HaobanQywxFeeApiService haobanQywxFeeApiService;
@Autowired
private ExternalClerkRelatedApiService externalClerkRelatedApiService ;
/**
* 创建定时器
......@@ -152,11 +155,10 @@ public class TestController extends WebBaseController {
continue;
}
String wxEnterpriseId = staff.getWxEnterpriseId();
String wxUserId = staff.getWxUserId();
String taskName = "刷新企业微信好友（" + staff.getStaffName() + "）";
String taskId = dealSyncOperationApiService.createWxFriendTaskSingle(staff.getWxEnterpriseId(), taskName, staffId, staff.getStaffName(), SyncTaskTypeEnum.FRIEND_SINGLE.getType());
if (StringUtils.isNotBlank(taskId)) {
dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, wxUserId, staffId, wxEnterpriseId);
dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staffId, staffId, wxEnterpriseId);
}
}
return resultResponse(HaoBanErrCode.ERR_1);
......@@ -215,12 +217,24 @@ public class TestController extends WebBaseController {
* @return
*/
@RequestMapping("/flash-friend-wxEnterpriseId")
public HaobanResponse sendMass(String wxEnterpriseId) {
public HaobanResponse sendStockMemberRelationMessage(String wxEnterpriseId) {
if (org.apache.commons.lang.StringUtils.isEmpty(wxEnterpriseId)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
// 异步调用
groupSendOperateApiService.sendStockMemberRelationMessage(wxEnterpriseId);
this.externalClerkRelatedApiService.initWxEnterpriseFriend(wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_1);
}
/**
* 收费
*
* @param wxEnterpriseId
* @return
*/
@RequestMapping("/addFee")
public HaobanResponse addFee(String wxEnterpriseId) {
haobanQywxFeeApiService.addFee(wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_1);
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestDataImportController.java
package com.gic.haoban.manage.web.controller.test;
import com.gic.api.base.commons.Page;
import com.gic.commons.util.RandomUtil;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.ExternalUserDTO;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.web.controller.WebBaseController;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.qo.ImportMemberQo;
import com.gic.haoban.task.manage.api.dto.MarketClueTaskDTO;
import com.gic.haoban.task.manage.api.service.IMarketClueTaskApiService;
import com.gic.haoban.task.manage.api.service.IMarketTaskMemberApiService;
......@@ -41,77 +31,11 @@ public class TestDataImportController extends WebBaseController {
private static final Logger logger = getLogger(TestDataImportController.class);
@Autowired
private StaffApiService staffApiService;
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired
private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
@Autowired
private IMarketClueTaskApiService iMarketClueTaskApiService;
@Autowired
private IMarketTaskMemberApiService iMarketTaskMemberApiService;
/**
* 导入会员好友
*
* @param qo
* @return
*/
@RequestMapping("/friend-import")
public HaobanResponse importFriend(ImportMemberQo qo) {
if (StringUtils.isAnyBlank(qo.getClerkCode(), qo.getClerkId(), qo.getDepartmentId(), qo.getEnterpriseId(), qo.getMemberId()
, qo.getPhoneNumber(), qo.getStoreId(), qo.getUnionid(), qo.getWxEnterpriseId())) {
return resultResponse(HaoBanErrCode.ERR_2);
}
StaffDTO staffDTO = staffApiService.selectByUserIdAndEnterpriseId(qo.getWxUserId(), qo.getWxEnterpriseId());
if (null == staffDTO) {
StaffDTO staff = new StaffDTO();
staff.setPhoneNumber(qo.getPhoneNumber());
staff.setWxUserId(qo.getWxUserId());
staff.setWxEnterpriseId(qo.getWxEnterpriseId());
staff.setStaffName(qo.getClerkCode());
staff.setSex(1);
staff.setNationCode("86");
staff.setActiveFlag(1);
ServiceResponse add = staffApiService.add(staff, qo.getDepartmentId());
if (add.getCode() == 1) {
staffDTO = staffApiService.selectById(add.getResult().toString());
}
}
StaffClerkRelationDTO clerkRelationDTO = staffClerkRelationApiService.getOneByStoreIdAndStaffId(qo.getStoreId(), staffDTO.getStaffId());
if (clerkRelationDTO == null) {
StaffClerkRelationDTO staffClerkRelationDTO = new StaffClerkRelationDTO();
staffClerkRelationDTO.setStoreId(qo.getStoreId());
staffClerkRelationDTO.setClerkId(qo.getClerkId());
staffClerkRelationDTO.setClerkCode(qo.getClerkCode());
staffClerkRelationDTO.setWxUserId(staffDTO.getWxUserId());
staffClerkRelationDTO.setStaffId(staffDTO.getStaffId());
staffClerkRelationDTO.setWxEnterpriseId(qo.getWxEnterpriseId());
staffClerkRelationDTO.setEnterpriseId(qo.getEnterpriseId());
ServiceResponse response = staffClerkRelationApiService.bindStaffClerk(staffClerkRelationDTO, "-1", ChannelCodeEnum.ADMIN_BIND.getCode());
}
//新增好友
ExternalUserDTO dto = new ExternalUserDTO();
dto.setUnionId(qo.getUnionid());
dto.setWxUserId(qo.getWxUserId());
dto.setWxEnterpriseId(qo.getWxEnterpriseId());
dto.setMemberId(qo.getMemberId());
dto.setExternalUserId(qo.getMemberId());
dto.setClerkId(qo.getClerkId());
dto.setStoreId(qo.getStoreId());
dto.setEnterpriseId(qo.getEnterpriseId());
dto.setName("测试会员" + RandomUtil.getRandomString(5));
dto.setStaffId(staffDTO.getStaffId());
dto.setAddCreateTime(Long.valueOf(System.currentTimeMillis() / 1000).toString());
memberUnionidRelatedApiService.addExternal(dto);
return resultResponse(HaoBanErrCode.ERR_1);
}
/**
* 处理任务
......@@ -141,7 +65,7 @@ public class TestDataImportController extends WebBaseController {
int i = random.nextInt();
if (i <= rate) {
logger.info("处理：{}", com.alibaba.fastjson.JSONObject.toJSONString(dto));
iMarketTaskMemberApiService.detailsRefresh(enterpriseId, dto.getTaskId(), true);
iMarketTaskMemberApiService.detailsRefresh(enterpriseId, dto.getTaskId());
}
});
num++;
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/response/WebLoginResponse.java deleted 100644 → 0
package com.gic.haoban.manage.web.response;
import com.gic.haoban.manage.api.dto.EnterpriseDTO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2018/12/28.
*
* @author hua
*/
public class WebLoginResponse implements Serializable {
private String userId;
private List<EnterpriseDTO> enterpriseList;
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public List<EnterpriseDTO> getEnterpriseList() {
return enterpriseList;
}
public void setEnterpriseList(List<EnterpriseDTO> enterpriseList) {
this.enterpriseList = enterpriseList;
}
}
haoban-manage3-operation-web/src/main/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml
......@@ -14,10 +14,6 @@
<dubbo:application name="haoban-manage3-operation-web"/>
<dubbo:protocol name="dubbo" port="300112"/>
<!-- 使用zookeeper注册中心暴露服务地址 -->
<!-- <dubbo:registry address="zookeeper://192.168.1.118:2181" protocol="dubbo" id="localAdd"/> -->
<!--<dubbo:registry address="zookeeper://115.159.182.172:2199" protocol="dubbo" id="remoteAdd"/>-->
<!--<dubbo:registry address="zookeeper://localhost:2181|zookeeper://115.159.182.172:2199" protocol="dubbo"/>-->
<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffApiService" id="staffApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.TestApiService" id="testApiService"/>
......@@ -66,8 +62,8 @@
<dubbo:reference interface="com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService"
id="externalClerkRelatedApiService" timeout="30000"/>
<dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxUserApiService" id="qywxUserApiService"/>
<dubbo:reference interface="com.gic.haoban.task.manage.api.service.GroupSendOperateApiService"
id="groupSendOperateApiService" async="true"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.QywxErrorLogApiService" id="qywxErrorLogApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService" id="haobanQywxFeeApiService"/>
</beans>
haoban-manage3-service/pom.xml
......@@ -90,11 +90,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-communicate-api</artifactId>
<version>${haoban-communicate-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-wechat-api</artifactId>
......@@ -128,6 +124,12 @@
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-marketing-api</artifactId>
<version>${gic-marketing-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-app-customer-api</artifactId>
<version>${haoban-app-customer-api}</version>
</dependency>
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/HandoverExternalMapper.java
......@@ -9,21 +9,6 @@ import java.util.List;
@Mapper
public interface HandoverExternalMapper {
/**
*/
int deleteByPrimaryKey(String handoverExternalId);
/**
*/
int insert(TabHandoverExternal record);
/**
*/
int insertSelective(TabHandoverExternal record);
/**
*/
TabHandoverExternal selectByPrimaryKey(String handoverExternalId);
/**
*/
......@@ -31,10 +16,6 @@ public interface HandoverExternalMapper {
/**
*/
int updateByPrimaryKey(TabHandoverExternal record);
/**
*/
int insertBatch(@Param("list") List<TabHandoverExternal> list);
/**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java
package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface MemberUnionidRelatedMapper {
int deleteByPrimaryKey(String memberUnionidRelatedId);
int insert(MemberUnionidRelated record);
......@@ -16,31 +14,16 @@ public interface MemberUnionidRelatedMapper {
int updateByPrimaryKeySelective(MemberUnionidRelated record);
int cleanByCid(@Param("cid") String cid);
MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId, @Param("unionid") String unionid);
MemberUnionidRelated getByMemberId(@Param("wxUserId") String wxUserId, @Param("memberId") String memberId);
MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffId") String staffId, @Param("unionid") String unionid);
void deleteByUnionidAndUserId(@Param("externalUserid") String externalUserid, @Param("wxUserId") String wxUserId);
void deleteByUnionidAndUserId(@Param("externalUserid") String externalUserid, @Param("staffId") String staffId);
void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("wxUserId") String wxUserId);
List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId);
void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("staffId") String staffId);
List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId") String enterpriseId, @Param("date") Date date);
MemberUnionidRelated getByParams(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId,
@Param("externalName") String name, @Param("addCreateTime") String createTime);
List<MemberUnionidRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid") String externalUserid, @Param("wxUserId") String wxUserId);
Page<MemberUnionidRelated> pageMemberUnionByParams(@Param("userIdList") List<String> userIdList, @Param("sendMemberIds") List<String> sendMemberIds,
@Param("enterpriseId") String enterpriseId);
List<MemberUnionidRelated> getByWxUserIdListAndWxEnterpriseId(@Param("userIdList") List<String> userIdList, @Param("wxEnterpriseId") String wxEnterpriseId);
void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
/**
......@@ -51,9 +34,9 @@ public interface MemberUnionidRelatedMapper {
* @param selfExternalUserId
* @return
*/
MemberUnionidRelated getBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
MemberUnionidRelated getBySelfExternalUserId(@Param("staffId") String staffId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
List<MemberUnionidRelated> listBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
List<MemberUnionidRelated> listBySelfExternalUserId(@Param("staffId") String staffId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
/**
* 更新外部用户id的老外部用户id
......@@ -70,30 +53,6 @@ public interface MemberUnionidRelatedMapper {
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:32:46
*/
int updateUserIdByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
/**
* 更新自建外部用户id
*
* @param new_external_userid 新外部标识
* @param external_userid 外部用户标识
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:35:21
*/
int updateSelfExternalUserIdByOldSelfExternalUserId(@Param("newExternalUserId") String new_external_userid,
@Param("oldExternalUserId") String external_userid,
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* wx企业id查询数据
*
* @param wxEnterpriseId wx企业标识
......@@ -103,13 +62,4 @@ public interface MemberUnionidRelatedMapper {
*/
List<MemberUnionidRelated> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 更新外部userid wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 19:36:00
*/
int updateExternalUseridByWxEnterpriseId(String wxEnterpriseId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/PreDealLogMapper.java
......@@ -192,7 +192,7 @@ public interface PreDealLogMapper {
* @param dataContent
* @return
*/
int updateFriendStatusAndRelationKeyByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId, @Param("status") int status, @Param("reason") String reason, @Param("dataContent") String dataContent, @Param("relationKey") String relationKey);
int updateFriendStatusAndRelationKeyByDataId(@Param("taskId") String taskId, @Param("dataId") String dataId, @Param("status") int status, @Param("reason") String reason, @Param("dataContent") String dataContent, @Param("relationKey") String relationKey , @Param("dataType") int dataType);
/**
*
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffDepartmentRelatedMapper.java
......@@ -6,46 +6,29 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface StaffDepartmentRelatedMapper {
int deleteByPrimaryKey(String staffDepartmentRelatedId);
int insert(TabHaobanStaffDepartmentRelated record);
int insertSelective(TabHaobanStaffDepartmentRelated record);
TabHaobanStaffDepartmentRelated selectByPrimaryKey(String staffDepartmentRelatedId);
int updateByPrimaryKeySelective(TabHaobanStaffDepartmentRelated record);
int updateByPrimaryKey(TabHaobanStaffDepartmentRelated record);
List<TabHaobanStaffDepartmentRelated> listByDepartmentId(String departmentId);
TabHaobanStaffDepartmentRelated getOneByClerkCode(String clerkCode);
void deleteCode(TabHaobanStaffDepartmentRelated dto);
List<TabHaobanStaffDepartmentRelated> listStaffDepartmentByStaffId(String staffId);
TabHaobanStaffDepartmentRelated getById(String staffDepartmentRelatedId);
int delByUserid(@Param("userid") String userId);
int delByStaffid(@Param("staffId") String staffId);
TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(@Param("departmentId")String departmentId, @Param("staffId")String staffId);
int countByDepartmentId(@Param("departmentId")String departmentId);
TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentIds")List<String> departmentIds, @Param("keyword")String keyword);
int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
List<TabHaobanStaffDepartmentRelated> listByWxUserId(@Param("wxUserId")String wxUserId);
List<TabHaobanStaffDepartmentRelated> listByClerkCode(@Param("clerkCode")String clerkCode);
List<TabHaobanStaffDepartmentRelated> listByWxEnterpriseIdAndClerkCode(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("clerkCode")String clerkCode);
List<TabHaobanStaffDepartmentRelated> listStaffDepartmentByStaffIds(@Param("staffIds")List<String> staffIds);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
......@@ -56,14 +39,4 @@ public interface StaffDepartmentRelatedMapper {
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("staffId") String staffId
);
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:25:33
*/
int updateUserIdByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
......@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface StaffMapper {
int deleteByPrimaryKey(String staffId);
int insertSelective(TabHaobanStaff record);
......@@ -18,9 +17,13 @@ public interface StaffMapper {
TabHaobanStaff selectByNationcodeAndPhoneNumber(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("nationCode") String nationcode, @Param("phoneNumber") String phoneNumber);
List<TabHaobanStaff> listByIds(@Param("staffIds") List<String> staffIds);
TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId") String userId, @Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaff> listByUserIdsAndWxEnterpriseId(@Param("userIds") List<String> userIds, @Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaff> listByWxUserId(@Param("wxUserId") String wxUserId,@Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName, @Param("wxEnterpriseId") String wxEnterpriseId);
Page<TabHaobanStaff> pageStaff(@Param("staffIds") List<String> staffIds,
......@@ -30,28 +33,10 @@ public interface StaffMapper {
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("relationFlag") Integer relationFlag);
/**
* 选择用户id和企业标识
*
* @param userId 用户id
* @param wxEnterpriseId wx企业标识
* @return {@link TabHaobanStaff }
* @author mozhu
* @date 2022-01-13 15:05:28
*/
TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId") String userId,
@Param("wxEnterpriseId") String wxEnterpriseId);
TabHaobanStaff selectSuperByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber") String phoneNumber);
List<TabHaobanStaff> listByUserIdsAndWxEnterpriseId(@Param("userIds") List<String> userIds, @Param("wxEnterpriseId") String wxEnterpriseId);
int cleanStaff(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
TabHaobanStaff getWxStaffByOne(@Param("wxEnterpriseId") String wxEnterpriseId);
List<String> listUserStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
List<TabHaobanStaff> listNoStatusStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
......@@ -60,54 +45,19 @@ public interface StaffMapper {
/**
* 通过开放用户id和wx企业id列表
*
* @param openUserIds 开放的用户id
* @param wxEnterpriseId wx企业标识
* @return {@link List<TabHaobanStaff> }
* @author mozhu
* @date 2021-12-21 16:35:35
*/
List<TabHaobanStaff> listByOpenUserIdsAndWxEnterpriseId(@Param("openUserIds") List<String> openUserIds,
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 用户id wx企业id列表
*
* @param wxEnterpriseId wx企业标识
* @return {@link List<String> }
* @author mozhu
* @date 2021-12-21 17:05:58
*/
List<TabHaobanStaff> listUserIdByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 更新开放用户id,用户id
*
* @param wxEnterpriseId wx企业标识
* @param wxUserId wx用户id
* @param wxOpenUseId 开放的用户id
* @return int
* @author mozhu
* @date 2021-12-21 17:17:51
*/
int updateOpenUserIdsByUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("wxUserId") String wxUserId,
@Param("wxOpenUseId") String wxOpenUseId);
/**
* 选择通过打开用户id和企业标识
*
* @param wxOpenUseId wx开放使用id
* @param wxEnterpriseId wx企业标识
* @return {@link TabHaobanStaff }
* @author mozhu
* @date 2021-12-21 21:13:56
*/
TabHaobanStaff selectByOpenUserIdAndEnterpriseId(@Param("wxOpenUseId") String wxOpenUseId,
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 更新开放id员工id
*
* @param staffId 员工id
......@@ -127,12 +77,6 @@ public interface StaffMapper {
/**
* 选择电话号码和企业标识
*
* @param phoneNumber 电话号码
* @param wxEnterpriseId wx企业标识
* @return {@link TabHaobanStaff }
* @author mozhu
* @date 2022-01-12 17:20:16
*/
TabHaobanStaff selectByPhoneNumberAndEnterpriseId(@Param("phoneNumber") String phoneNumber,
@Param("wxEnterpriseId") String wxEnterpriseId);
......@@ -159,43 +103,27 @@ public interface StaffMapper {
*/
List<TabHaobanStaff> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 更新wx用户id通过员工id
*
* @param wxEnterpriseId wx企业标识
* @param newWxUserId 新wx用户id
* @param oldWxUserId 老wx用户id
* @return int
* @author mozhu
* @date 2022-06-30 15:53:13
*/
int updateUserIdByUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("newWxUserId") String newWxUserId,
@Param("oldWxUserId") String oldWxUserId);
/**
* 更新userid by open_userid
* 更新添加num通过id
*
* @param wxEnterpriseId wx企业标识
* @param wxOpenUseId wx开放使用id
* @param wxUserId wx用户id
* @param staffId 员工id
* @return int
* @author mozhu
* @date 2022-07-18 19:09:16
* @date 2022-07-25 16:33:30
*/
int updateWxUserIdsByWxOpenUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("wxOpenUseId") String wxOpenUseId,
@Param("wxUserId") String wxUserId);
int updateAddNumById(@Param("staffId") String staffId);
/**
* 更新添加num通过id
* 更新是否激活
*
* @param staffId 员工id
* @param activeStatus 活跃状态
* @param staffId 员工id
* @return int
* @author mozhu
* @date 2022-07-25 16:33:30
* @date 2022-08-03 17:36:52
*/
int updateAddNumById(@Param("staffId") String staffId);
int updateActiveStatusById(@Param("activeStatus")Integer activeStatus,@Param("staffId") String staffId);
/**
* 重置添加num
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java
......@@ -9,15 +9,11 @@ import java.util.List;
import java.util.Set;
public interface TabHaobanStaffClerkRelationMapper {
int deleteByPrimaryKey(String staffClerkRelationId);
int insert(TabHaobanStaffClerkRelation record);
TabHaobanStaffClerkRelation selectByPrimaryKey(String staffClerkRelationId);
int updateByPrimaryKeySelective(TabHaobanStaffClerkRelation record);
List<TabHaobanStaffClerkRelation> listBindCode(@Param("enterpriseId") String enterpriseId, @Param("clerkCodeList") Set<String> clerkCodeList);
List<TabHaobanStaffClerkRelation> listBindCodeByStaffId(@Param("enterpriseIdList") List<String> enterpriseIdList, @Param("staffId") String staffId);
......@@ -69,7 +65,7 @@ public interface TabHaobanStaffClerkRelationMapper {
List<StaffClerkRelationDTO> listByClerkIds(@Param("clerkIds") List<String> clerkIds);
List<TabHaobanStaffClerkRelation> listByStoreId(@Param("storeId") String storeId);
TabHaobanStaffClerkRelation getOneByStoreIdAndStaffId(@Param("storeId") String storeId, @Param("staffId") String staffId);
/**
......@@ -82,6 +78,8 @@ public interface TabHaobanStaffClerkRelationMapper {
TabHaobanStaffClerkRelation getOneBindStoreId(@Param("staffId") String staffId, @Param("storeId") String storeId);
TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId") String clerkId);
StaffClerkRelationDTO getByClerkIdForWxUserId(@Param("clerkId") String clerkId);
TabHaobanStaffClerkRelation getByClerkIdNoStatus(@Param("clerkId") String clerkId);
......@@ -89,17 +87,17 @@ public interface TabHaobanStaffClerkRelationMapper {
void delByClerkId(@Param("clerkId") String clerkId);
List<TabHaobanStaffClerkRelation> listByEnterpriseIdAndWxUserId(@Param("enterpriseId") String enterpriseId, @Param("wxUserId") String wxUserId);
List<TabHaobanStaffClerkRelation> listByEnterpriseIdAndStaffid(@Param("enterpriseId") String enterpriseId, @Param("staffId") String staffId);
List<TabHaobanStaffClerkRelation> lisByStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffId") String staffId, @Param("storeIdList") List<String> storeIdList);
TabHaobanStaffClerkRelation getByCodeAndStoreId(@Param("clerkCode") String clerkCode, @Param("storeId") String storeId);
List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<String> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaffClerkRelation> pageByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaffClerkRelation> listBindByStoreId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId") String storeId);
List<StaffClerkRelationDTO> listBindByStoreId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId") String storeId);
/**
* 授权绑定的列表
......@@ -133,16 +131,6 @@ public interface TabHaobanStaffClerkRelationMapper {
*/
List<TabHaobanStaffClerkRelation> listBindStoreIdByEnterpriseId(String enterpriseId);
/**
* 列出所有
*
* @return {@link List<TabHaobanStaffClerkRelation> }
* @author xuwenqian
* @date 2021-07-15 16:24:27
*/
List<StaffClerkRelationDTO> listAll();
/**
* 查询有关联的员工id列表
*
......@@ -153,28 +141,7 @@ public interface TabHaobanStaffClerkRelationMapper {
List<String> listRelationsStaffId(@Param("staffIdList") Set<String> staffIdList);
/**
* 批量查询会员与导购关系并且返回关联信息
*
* @param memberIdList 会员id列表
* @param clerkIdList 导购id列表
* @param enterpriseId 企业id
* @return {@link MemberStaffRelExtDO}
*/
List<MemberStaffRelExtDO> listMemberStaffRel(
@Param("memberIdList") List<String> memberIdList,
@Param("clerkIdList") List<String> clerkIdList,
@Param("enterpriseId") String enterpriseId);
/**
* 批量查询会员与导购关系并且返回关联信息（新企业）
*
* @param memberIdList 会员id列表
* @param clerkIdList 职员id列表
* @param enterpriseId 企业标识
* @return {@link List<MemberStaffRelExtDO> }
* @author mozhu
* @date 2021-12-23 15:45:48
*/
List<MemberStaffRelExtDO> listMemberStaffRelNew(
@Param("memberIdList") List<String> memberIdList,
......@@ -182,17 +149,6 @@ public interface TabHaobanStaffClerkRelationMapper {
@Param("enterpriseId") String enterpriseId);
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:21:31
*/
int updateUserIdByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 根据导购查询wxuserid
*
* @param clerkIds 职员id
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseMapper.java
......@@ -9,7 +9,6 @@ import java.util.List;
import java.util.Set;
public interface WxEnterpriseMapper {
int deleteByPrimaryKey(String wxEnterpriseId);
int insertSelective(TabHaobanWxEnterprise record);
......@@ -75,11 +74,22 @@ public interface WxEnterpriseMapper {
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 列出所有企业（与gic关联）
* 更新是否开启自动激活
*
* @return {@link List }<{@link WxEnterpriseDTO }>
* @param autoActiveFlag
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-08 13:45:30
* @date 2022-08-03 17:27:13
*/
int updateAutoActiveFlagById(@Param("autoActiveFlag") Integer autoActiveFlag, @Param("wxEnterpriseId") String wxEnterpriseId);
void updateWxSecurityType(@Param("wxEnterpriseId") String wxEnterpriseId , @Param("wxSecurityType") Integer wxSecurityType) ;
/**
* 列出所有企业（与gic关联）
*
*/
List<WxEnterpriseDTO> listAllEnterprise();
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeAccountInterceptLogMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper.fee;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeAccountInterceptLog;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
/**
* 企业微信账号拦截日志(TabHaobanQywxFeeAccountInterceptLog)表数据库访问层
*
* @author mozhu
* @since 2022-08-10 10:27:45
*/
public interface TabHaobanQywxFeeAccountInterceptLogMapper {
/**
* 通过ID查询单条数据
*
* @param feeAccountInterceptId 主键
* @return 实例对象
*/
TabHaobanQywxFeeAccountInterceptLog queryById(Long feeAccountInterceptId);
/**
* 查询指定行数据
*
* @param tabHaobanQywxFeeAccountInterceptLog 查询条件
* @param pageable 分页对象
* @return 对象列表
*/
List<TabHaobanQywxFeeAccountInterceptLog> queryAllByLimit(TabHaobanQywxFeeAccountInterceptLog tabHaobanQywxFeeAccountInterceptLog, @Param("pageable") Pageable pageable);
/**
* 新增数据
*
* @param tabHaobanQywxFeeAccountInterceptLog 实例对象
* @return 影响行数
*/
int insert(TabHaobanQywxFeeAccountInterceptLog tabHaobanQywxFeeAccountInterceptLog);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
* @param entities List<TabHaobanQywxFeeAccountInterceptLog> 实例对象列表
* @return 影响行数
*/
int insertBatch(@Param("entities") List<TabHaobanQywxFeeAccountInterceptLog> entities);
/**
* 修改数据
*
* @param tabHaobanQywxFeeAccountInterceptLog 实例对象
* @return 影响行数
*/
int update(TabHaobanQywxFeeAccountInterceptLog tabHaobanQywxFeeAccountInterceptLog);
/**
* 通过主键删除数据
*
* @param feeAccountInterceptId 主键
* @return 影响行数
*/
int deleteById(Long feeAccountInterceptId);
/**
* 查询天气企业服务id
*
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link TabHaobanQywxFeeAccountInterceptLog }>
* @author mozhu
* @date 2022-08-10 14:55:59
*/
List<TabHaobanQywxFeeAccountInterceptLog> queryByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeAccountStaffMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper.fee;
import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDetailDTO;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeAccountStaff;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* 企业微信收费订单成员激活详情(TabHaobanQywxFeeAccountStaff)表数据库访问层
*
* @author mozhu
* @since 2022-08-03 16:12:31
*/
public interface TabHaobanQywxFeeAccountStaffMapper {
/**
* 通过ID查询单条数据
*
* @param feeAccountId 主键
* @return 实例对象
*/
TabHaobanQywxFeeAccountStaff queryById(Long feeAccountId);
/**
* 新增数据
*
* @param tabHaobanQywxFeeAccountStaff 实例对象
* @return 影响行数
*/
int insert(TabHaobanQywxFeeAccountStaff tabHaobanQywxFeeAccountStaff);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
* @param entities List<TabHaobanQywxFeeAccountStaff> 实例对象列表
* @return 影响行数
*/
int insertBatch(@Param("entities") List<TabHaobanQywxFeeAccountStaff> entities);
/**
* 修改数据
*
* @param tabHaobanQywxFeeAccountStaff 实例对象
* @return 影响行数
*/
int update(TabHaobanQywxFeeAccountStaff tabHaobanQywxFeeAccountStaff);
/**
* 通过主键删除数据
*
* @param feeAccountId 主键
* @return 影响行数
*/
int deleteById(Long feeAccountId);
/**
* 详情
*
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link HaobanQywxFeeDetailDTO }>
* @author mozhu
* @date 2022-08-05 15:40:09
*/
List<HaobanQywxFeeDetailDTO> feeDetail(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 获取最新的过期时间
* @param wxEnterpriseId
* @return
*/
Date lastFeeInterceptTime(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 未来30天过期拦截数
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-08 15:53:32
*/
int lastFeeInterceptCount(@Param("wxEnterpriseId") String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper.fee;
import com.gic.haoban.manage.api.dto.qdto.QywxFeeListQDTO;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFee;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 企业微信收费(TabHaobanQywxFee)表数据库访问层
*
* @author mozhu
* @since 2022-08-03 16:12:29
*/
public interface TabHaobanQywxFeeMapper {
/**
* 通过ID查询单条数据
*
* @param qwFeeId 主键
* @return 实例对象
*/
TabHaobanQywxFee queryById(Long qwFeeId);
/**
* 查询指定行数据
*
* @param qywxFeeListQDTO qywx qdto费用列表
* @return {@link List }<{@link TabHaobanQywxFee }>
* @author mozhu
* @date 2022-08-05 15:31:07
*/
List<TabHaobanQywxFee> listPage(QywxFeeListQDTO qywxFeeListQDTO);
/**
* 新增数据
*
* @param tabHaobanQywxFee 实例对象
* @return 影响行数
*/
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企业标识
* @return {@link TabHaobanQywxFee }
* @author mozhu
* @date 2022-08-10 17:59:04
*/
TabHaobanQywxFee queryByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderAccountMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper.fee;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrderAccount;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
/**
* 企业微信收费订单账号(激活码)(TabHaobanQywxFeeOrderAccount)表数据库访问层
*
* @author mozhu
* @since 2022-08-03 16:12:33
*/
public interface TabHaobanQywxFeeOrderAccountMapper {
/**
* 通过ID查询单条数据
*
* @param feeAccountId 主键
* @return 实例对象
*/
TabHaobanQywxFeeOrderAccount queryById(Long feeAccountId);
/**
* 查询指定行数据
*
* @param tabHaobanQywxFeeOrderAccount 查询条件
* @param pageable 分页对象
* @return 对象列表
*/
List<TabHaobanQywxFeeOrderAccount> queryAllByLimit(TabHaobanQywxFeeOrderAccount tabHaobanQywxFeeOrderAccount, @Param("pageable") Pageable pageable);
/**
* 新增数据
*
* @param tabHaobanQywxFeeOrderAccount 实例对象
* @return 影响行数
*/
int insert(TabHaobanQywxFeeOrderAccount tabHaobanQywxFeeOrderAccount);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
* @param entities List<TabHaobanQywxFeeOrderAccount> 实例对象列表
* @return 影响行数
*/
int insertBatch(@Param("entities") List<TabHaobanQywxFeeOrderAccount> entities);
/**
* 修改数据
*
* @param tabHaobanQywxFeeOrderAccount 实例对象
* @return 影响行数
*/
int update(TabHaobanQywxFeeOrderAccount tabHaobanQywxFeeOrderAccount);
/**
* 通过主键删除数据
*
* @param feeAccountId 主键
* @return 影响行数
*/
int deleteById(Long feeAccountId);
/**
* 未激活用户数
*
* @param status
* @param wxEnterpriseId
* @return int
* @author mozhu
* @date 2022-08-05 11:24:02
*/
int countOrderAccountStatus(@Param("status") Integer status,@Param("wxEnterpriseId") String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper.fee;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
/**
* 企业微信收费订单(TabHaobanQywxFeeOrder)表数据库访问层
*
* @author mozhu
* @since 2022-08-03 16:12:32
*/
public interface TabHaobanQywxFeeOrderMapper {
/**
* 通过ID查询单条数据
*
* @param feeOrderId 主键
* @return 实例对象
*/
TabHaobanQywxFeeOrder queryById(Long feeOrderId);
/**
* 查询指定行数据
*
* @param tabHaobanQywxFeeOrder 查询条件
* @param pageable 分页对象
* @return 对象列表
*/
List<TabHaobanQywxFeeOrder> queryAllByLimit(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder, @Param("pageable") Pageable pageable);
/**
* 新增数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 影响行数
*/
int insert(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
* @param entities List<TabHaobanQywxFeeOrder> 实例对象列表
* @return 影响行数
*/
int insertBatch(@Param("entities") List<TabHaobanQywxFeeOrder> entities);
/**
* 修改数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 影响行数
*/
int update(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder);
/**
* 通过主键删除数据
*
* @param feeOrderId 主键
* @return 影响行数
*/
int deleteById(Long feeOrderId);
/**
* 购买许可总数
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-05 11:18:22
*/
int countExternalContactCount(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 有订单
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-12 10:42:36
*/
int hasOrder(@Param("wxEnterpriseId") String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/WxUserAddLogMapper.java
......@@ -50,7 +50,7 @@ public interface WxUserAddLogMapper {
* @throws
*/
public TabWxUserAddLog selectNewLog(@Param("externalUserid") String externalUserid,
@Param("wxUserId") String wxUserId);
@Param("staffId") String staffId);
/**
*
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/MemberUnionidRelated.java
......@@ -18,8 +18,6 @@ public class MemberUnionidRelated implements Serializable {
private String externalUserid;
private String wxUserId;
private Date createTime;
private Date updateTime;
......@@ -30,8 +28,18 @@ public class MemberUnionidRelated implements Serializable {
private String addCreateTime;
private String staffId ;
private static final long serialVersionUID = 1L;
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getMemberUnionidRelatedId() {
return memberUnionidRelatedId;
}
......@@ -80,14 +88,6 @@ public class MemberUnionidRelated implements Serializable {
this.externalUserid = externalUserid == null ? null : externalUserid.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public Date getCreateTime() {
return createTime;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanExternalClerkRelated.java
......@@ -29,8 +29,6 @@ public class TabHaobanExternalClerkRelated implements Serializable {
private String clerkId;
private String staffId;
private String wxUserId;
/**
* 触达次数
*/
......@@ -160,14 +158,6 @@ public class TabHaobanExternalClerkRelated implements Serializable {
this.staffId = staffId == null ? null : staffId.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public Integer getStatusFlag() {
return statusFlag;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaff.java
......@@ -49,6 +49,7 @@ public class TabHaobanStaff implements Serializable {
private String wxOpenId;
private String qrCode;
private Integer addNum;
private Integer activeStatus;
@Transient
private String departmentIds;
......@@ -236,4 +237,12 @@ public class TabHaobanStaff implements Serializable {
public void setAddNum(Integer addNum) {
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/TabHaobanStaffClerkRelation.java
......@@ -12,8 +12,6 @@ public class TabHaobanStaffClerkRelation implements Serializable {
private String wxEnterpriseId;
private String wxUserId;
private String enterpriseId;
private String storeId;
......@@ -54,14 +52,6 @@ public class TabHaobanStaffClerkRelation implements Serializable {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getEnterpriseId() {
return enterpriseId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaffDepartmentRelated.java
......@@ -11,8 +11,6 @@ public class TabHaobanStaffDepartmentRelated implements Serializable {
private String phoneNumber;
private String nationCode;
private String wxUserId;
private String wxEnterpriseId;
......@@ -63,14 +61,6 @@ public class TabHaobanStaffDepartmentRelated implements Serializable {
this.nationCode = nationCode == null ? null : nationCode.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getDepartmentId() {
return departmentId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterprise.java
......@@ -9,8 +9,6 @@ public class TabHaobanWxEnterprise implements Serializable {
private String wxEnterpriseId;
private String corpid;
private String permanentCode;
private String corpName;
......@@ -56,13 +54,13 @@ public class TabHaobanWxEnterprise implements Serializable {
private Integer bindFlag;
private Integer statusFlag;
private Integer contactFlag;
private String wxSecretKey;
private String memberSecret;
private String contactSecret;
private Date wxSecretKeyLastTime;
......@@ -87,7 +85,28 @@ public class TabHaobanWxEnterprise implements Serializable {
*/
private Integer externalFlag;
private Integer useridFlag;
private Integer autoActiveFlag;
private Integer wxSecurityType ;
private String wxCorpid ;
private String openCorpid ;
public String getWxCorpid() {
return wxCorpid;
}
public String getOpenCorpid() {
return openCorpid;
}
public void setWxCorpid(String wxCorpid) {
this.wxCorpid = wxCorpid;
}
public void setOpenCorpid(String openCorpid) {
this.openCorpid = openCorpid;
}
public Integer getWxSecurityType() {
return wxSecurityType;
......@@ -113,14 +132,6 @@ public class TabHaobanWxEnterprise implements Serializable {
this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
}
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid == null ? null : corpid.trim();
}
public String getPermanentCode() {
return permanentCode;
}
......@@ -321,44 +332,44 @@ public class TabHaobanWxEnterprise implements Serializable {
this.updateTime = updateTime;
}
public Integer getContactFlag() {
return contactFlag;
}
public Integer getContactFlag() {
return contactFlag;
}
public void setContactFlag(Integer contactFlag) {
this.contactFlag = contactFlag;
}
public void setContactFlag(Integer contactFlag) {
this.contactFlag = contactFlag;
}
public String getWxSecretKey() {
return wxSecretKey;
}
public String getWxSecretKey() {
return wxSecretKey;
}
public void setWxSecretKey(String wxSecretKey) {
this.wxSecretKey = wxSecretKey;
}
public void setWxSecretKey(String wxSecretKey) {
this.wxSecretKey = wxSecretKey;
}
public String getContactSecret() {
return contactSecret;
}
public String getContactSecret() {
return contactSecret;
}
public void setContactSecret(String contactSecret) {
this.contactSecret = contactSecret;
}
public void setContactSecret(String contactSecret) {
this.contactSecret = contactSecret;
}
public Date getWxSecretKeyLastTime() {
return wxSecretKeyLastTime;
}
public Date getWxSecretKeyLastTime() {
return wxSecretKeyLastTime;
}
public void setWxSecretKeyLastTime(Date wxSecretKeyLastTime) {
this.wxSecretKeyLastTime = wxSecretKeyLastTime;
}
public void setWxSecretKeyLastTime(Date wxSecretKeyLastTime) {
this.wxSecretKeyLastTime = wxSecretKeyLastTime;
}
public Date getContactSecretLastTime() {
return contactSecretLastTime;
}
public Date getContactSecretLastTime() {
return contactSecretLastTime;
}
public void setContactSecretLastTime(Date contactSecretLastTime) {
this.contactSecretLastTime = contactSecretLastTime;
public void setContactSecretLastTime(Date contactSecretLastTime) {
this.contactSecretLastTime = contactSecretLastTime;
}
public Date getMemberSecretLastTime() {
......@@ -400,4 +411,12 @@ public class TabHaobanWxEnterprise implements Serializable {
public void setUseridFlag(Integer useridFlag) {
this.useridFlag = useridFlag;
}
public Integer getAutoActiveFlag() {
return autoActiveFlag;
}
public void setAutoActiveFlag(Integer autoActiveFlag) {
this.autoActiveFlag = autoActiveFlag;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/ext/MemberStaffRelExtDO.java
......@@ -18,10 +18,7 @@ public class MemberStaffRelExtDO implements Serializable {
* 会员对外联系人id
*/
private String memberExternalUserId;
/**
* 导购员工的外部联系人id-wxUserId
*/
private String staffWxUserId;
private String staffId;
/**
* 员工导购id
*/
......@@ -42,13 +39,13 @@ public class MemberStaffRelExtDO implements Serializable {
public void setMemberExternalUserId(String memberExternalUserId) {
this.memberExternalUserId = memberExternalUserId;
}
public String getStaffWxUserId() {
return staffWxUserId;
public String getStaffId() {
return staffId;
}
public void setStaffWxUserId(String staffWxUserId) {
this.staffWxUserId = staffWxUserId;
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffClerkId() {
......@@ -61,10 +58,7 @@ public class MemberStaffRelExtDO implements Serializable {
@Override
public String toString() {
return "MemberStaffRelExtDO{" +
"memberId='" + memberId + '\'' +
", staffWxUserId='" + staffWxUserId + '\'' +
", staffClerkId='" + staffClerkId + '\'' +
'}';
return "MemberStaffRelExtDO{" + "memberId='" + memberId + '\'' + ", staffId='" + staffId + '\''
+ ", staffClerkId='" + staffClerkId + '\'' + '}';
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/fee/TabHaobanQywxFee.java 0 → 100644
package com.gic.haoban.manage.service.entity.fee;
import java.io.Serializable;
import java.util.Date;
/**
* 企业微信收费(TabHaobanQywxFee)实体类
*
* @author mozhu
* @since 2022-08-03 16:12:30
*/
public class TabHaobanQywxFee implements Serializable {
private static final long serialVersionUID = -65108900619188163L;
private Long qwFeeId;
private String corpName;
private String corpId;
private String wxEnterpriseId;
/**
* 拦截时间
*/
private Date interceptTime;
/**
* 拦截用户总数
*/
private Integer interceptUserNum;
/**
* 剩余可用许可
*/
private Integer permissionUserNum;
/**
* 购买许可总数
*/
private Integer buyPermissionUserNum;
/**
* 拦截：1:已拦截；0：将被拦截
*/
private Integer interceptFlag;
public Long getQwFeeId() {
return qwFeeId;
}
public void setQwFeeId(Long qwFeeId) {
this.qwFeeId = qwFeeId;
}
public String getCorpName() {
return corpName;
}
public void setCorpName(String corpName) {
this.corpName = corpName;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Date getInterceptTime() {
return interceptTime;
}
public void setInterceptTime(Date interceptTime) {
this.interceptTime = interceptTime;
}
public Integer getInterceptUserNum() {
return interceptUserNum;
}
public void setInterceptUserNum(Integer interceptUserNum) {
this.interceptUserNum = interceptUserNum;
}
public Integer getPermissionUserNum() {
return permissionUserNum;
}
public void setPermissionUserNum(Integer permissionUserNum) {
this.permissionUserNum = permissionUserNum;
}
public Integer getBuyPermissionUserNum() {
return buyPermissionUserNum;
}
public void setBuyPermissionUserNum(Integer buyPermissionUserNum) {
this.buyPermissionUserNum = buyPermissionUserNum;
}
public Integer getInterceptFlag() {
return interceptFlag;
}
public void setInterceptFlag(Integer interceptFlag) {
this.interceptFlag = interceptFlag;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/fee/TabHaobanQywxFeeAccountInterceptLog.java 0 → 100644
package com.gic.haoban.manage.service.entity.fee;
import java.io.Serializable;
import java.util.Date;
/**
* 企业微信账号拦截日志(TabHaobanQywxFeeAccountInterceptLog)实体类
*
* @author mozhu
* @since 2022-08-10 10:27:47
*/
public class TabHaobanQywxFeeAccountInterceptLog implements Serializable {
private static final long serialVersionUID = -14545100741695880L;
private Long feeAccountInterceptId;
private String corpId;
private String wxEnterpriseId;
/**
* 用户id
*/
private String wxUserId;
/**
* 员工id
*/
private String staffId;
private Date qwCreateTime;
public Long getFeeAccountInterceptId() {
return feeAccountInterceptId;
}
public void setFeeAccountInterceptId(Long feeAccountInterceptId) {
this.feeAccountInterceptId = feeAccountInterceptId;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public Date getQwCreateTime() {
return qwCreateTime;
}
public void setQwCreateTime(Date qwCreateTime) {
this.qwCreateTime = qwCreateTime;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/fee/TabHaobanQywxFeeAccountStaff.java 0 → 100644
package com.gic.haoban.manage.service.entity.fee;
import java.io.Serializable;
import java.util.Date;
/**
* 企业微信收费订单成员激活详情(TabHaobanQywxFeeAccountStaff)实体类
*
* @author mozhu
* @since 2022-08-03 16:12:31
*/
public class TabHaobanQywxFeeAccountStaff implements Serializable {
private static final long serialVersionUID = -61823317787793524L;
private Long feeAccountStaffId;
private String orderId;
private String corpId;
private String wxEnterpriseId;
/**
* 员工id
*/
private String staffId;
/**
* 帐号码
*/
private String activeCode;
/**
* 帐号类型：1:基础帐号，2:互通帐号
*/
private Integer accountType;
/**
* 过期时间
*/
private Date expireTime;
/**
* 激活时间
*/
private Date activeTime;
public Long getFeeAccountStaffId() {
return feeAccountStaffId;
}
public void setFeeAccountStaffId(Long feeAccountStaffId) {
this.feeAccountStaffId = feeAccountStaffId;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getActiveCode() {
return activeCode;
}
public void setActiveCode(String activeCode) {
this.activeCode = activeCode;
}
public Integer getAccountType() {
return accountType;
}
public void setAccountType(Integer accountType) {
this.accountType = accountType;
}
public Date getExpireTime() {
return expireTime;
}
public void setExpireTime(Date expireTime) {
this.expireTime = expireTime;
}
public Date getActiveTime() {
return activeTime;
}
public void setActiveTime(Date activeTime) {
this.activeTime = activeTime;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/fee/TabHaobanQywxFeeOrder.java 0 → 100644
package com.gic.haoban.manage.service.entity.fee;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 企业微信收费订单(TabHaobanQywxFeeOrder)实体类
*
* @author mozhu
* @since 2022-08-03 16:12:32
*/
public class TabHaobanQywxFeeOrder implements Serializable {
private static final long serialVersionUID = -71965900143069067L;
private Long feeOrderId;
/**
* 企微订单id
*/
private String orderId;
private String corpId;
private String wxEnterpriseId;
/**
* 订单类型，1：购买帐号，2：续期帐号，5:历史企业迁移订单
*/
private Integer orderType;
/**
* 订单状态，0：待支付，1：已支付，2：已取消（未支付，订单已关闭）3：未支付，订单已过期，4：申请退款中，5：退款成功，6：退款被拒绝，7：订单已失效
*/
private Integer orderStatus;
/**
* 订单金额，单位分
*/
private BigDecimal price;
/**
* 基础帐号个数
*/
private Integer baseCount;
/**
* 互通帐号个数
*/
private Integer externalContactCount;
/**
* 购买的月数
*/
private Integer months;
/**
* 创建时间
*/
private Date createTime;
/**
* 支付时间
*/
private Date payTime;
public Long getFeeOrderId() {
return feeOrderId;
}
public void setFeeOrderId(Long feeOrderId) {
this.feeOrderId = feeOrderId;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public Integer getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public Integer getBaseCount() {
return baseCount;
}
public void setBaseCount(Integer baseCount) {
this.baseCount = baseCount;
}
public Integer getExternalContactCount() {
return externalContactCount;
}
public void setExternalContactCount(Integer externalContactCount) {
this.externalContactCount = externalContactCount;
}
public Integer getMonths() {
return months;
}
public void setMonths(Integer months) {
this.months = months;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getPayTime() {
return payTime;
}
public void setPayTime(Date payTime) {
this.payTime = payTime;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/fee/TabHaobanQywxFeeOrderAccount.java 0 → 100644
package com.gic.haoban.manage.service.entity.fee;
import java.io.Serializable;
import java.util.Date;
/**
* 企业微信收费订单账号(激活码)(TabHaobanQywxFeeOrderAccount)实体类
*
* @author mozhu
* @since 2022-08-03 16:12:33
*/
public class TabHaobanQywxFeeOrderAccount implements Serializable {
private static final long serialVersionUID = 868383484183982731L;
private Long feeAccountId;
private String orderId;
private String corpId;
private String wxEnterpriseId;
/**
* 用户id
*/
private String wxUserId;
/**
* 帐号码
*/
private String activeCode;
/**
* 帐号类型：1:基础帐号，2:互通帐号
*/
private Integer accountType;
/**
* 帐号状态：1:未绑定，2:已绑定且有效，3:已过期，4:待转移，5:已合并
*/
private Integer status;
/**
* 过期时间
*/
private Date expireTime;
/**
* 激活时间
*/
private Date activeTime;
public Long getFeeAccountId() {
return feeAccountId;
}
public void setFeeAccountId(Long feeAccountId) {
this.feeAccountId = feeAccountId;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getActiveCode() {
return activeCode;
}
public void setActiveCode(String activeCode) {
this.activeCode = activeCode;
}
public Integer getAccountType() {
return accountType;
}
public void setAccountType(Integer accountType) {
this.accountType = accountType;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getExpireTime() {
return expireTime;
}
public void setExpireTime(Date expireTime) {
this.expireTime = expireTime;
}
public Date getActiveTime() {
return activeTime;
}
public void setActiveTime(Date activeTime) {
this.activeTime = activeTime;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmClerkRelation.java
......@@ -15,9 +15,7 @@ public class TabHaobanHmClerkRelation implements Serializable {
private Long relationId;
private Long hmId;
private String wxUserId;
private String wxEnterpriseId;
private String enterpriseId;
......@@ -67,14 +65,6 @@ public class TabHaobanHmClerkRelation implements Serializable {
this.hmId = hmId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmQrcode.java
......@@ -68,8 +68,6 @@ public class TabHaobanHmQrcode implements Serializable {
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
private String storeName;
......@@ -253,14 +251,6 @@ public class TabHaobanHmQrcode implements Serializable {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabWxUserAddLog.java
......@@ -23,8 +23,6 @@ public class TabWxUserAddLog implements Serializable {
/**成员信息*/
private String staffId;
private String staffName;
/**企微ID*/
private String wxUserId;
/**1添加 2删除*/
private Integer statusFlag;
/**0其他场景1引流链接2活码*/
......@@ -109,14 +107,6 @@ public class TabWxUserAddLog implements Serializable {
return staffName;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getWxUserId() {
return wxUserId;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/mq/MemberUnionRelateConsumerImpl.java deleted 100644 → 0
package com.gic.haoban.manage.service.mq;
import com.gic.haoban.manage.api.service.mq.MemberUnionRelateConsumer;
import com.gic.haoban.manage.service.mq.processor.AddMemberUnionRelateConsumerProcessor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* desc：微信会员消费服务实现
*
* @author: YongEn
* @date: 2022/2/16
**/
@Service
public class MemberUnionRelateConsumerImpl implements MemberUnionRelateConsumer {
@Autowired
private AddMemberUnionRelateConsumerProcessor addMemberUnionRelateConsumerProcessor;
@Override
public void addMemberUnionRelate(String messageParam) {
addMemberUnionRelateConsumerProcessor.process(messageParam);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/mq/processor/AbstractConsumerProcessor.java deleted 100644 → 0
package com.gic.haoban.manage.service.mq.processor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* desc：处理器
*
* @author: YongEn
* @date: 2022/2/16
**/
public abstract class AbstractConsumerProcessor<S, R> {
private static final Logger logger = LoggerFactory.getLogger(AbstractConsumerProcessor.class);
public void process(S messageParam) {
logger.info("接收到消费处理, 参数{}", messageParam);
// 参数解析
R r = paramParse(messageParam);
// 执行处理
doProcess(r);
}
/**
* desc: 参数解析
*
* @param s 原数据
* @return : {@link R}
* @author : YongEn
* @date : 2022/2/16
*/
abstract R paramParse(S s);
/**
* desc: 执行处理
*
* @param r 解析参数
* @return :
* @author : YongEn
* @date : 2022/2/16
*/
abstract void doProcess(R r);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/DealQywxExternalUserPojo.java
package com.gic.haoban.manage.service.pojo;
import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
import java.io.Serializable;
import com.gic.haoban.manage.api.dto.QwFrientNoticeDTO;
/**
* Created 2021/4/2.
*
......@@ -37,7 +37,7 @@ public class DealQywxExternalUserPojo implements Serializable {
}
private int type;
private MemberUnionidRelatedDTO data;
private QwFrientNoticeDTO data;
public int getType() {
return type;
......@@ -47,11 +47,11 @@ public class DealQywxExternalUserPojo implements Serializable {
this.type = type;
}
public MemberUnionidRelatedDTO getData() {
public QwFrientNoticeDTO getData() {
return data;
}
public void setData(MemberUnionidRelatedDTO data) {
public void setData(QwFrientNoticeDTO data) {
this.data = data;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/fee/HaobanQywxFeeBO.java 0 → 100644
package com.gic.haoban.manage.service.pojo.bo.fee;
import java.io.Serializable;
import java.util.Date;
/**
* 企业微信收费(TabHaobanQywxFee)实体类
*
* @author mozhu
* @since 2022-08-03 16:12:30
*/
public class HaobanQywxFeeBO implements Serializable {
private static final long serialVersionUID = -65108900619188163L;
private Long qwFeeId;
private String corpName;
private String corpId;
private String wxEnterpriseId;
/**
* 拦截时间
*/
private Date interceptTime;
/**
* 拦截用户总数
*/
private Integer interceptUserNum;
/**
* 剩余可用许可
*/
private Integer permissionUserNum;
/**
* 购买许可总数
*/
private Integer buyPermissionUserNum;
/**
* 拦截：1:已拦截；0：将被拦截
*/
private Integer interceptFlag;
public Long getQwFeeId() {
return qwFeeId;
}
public void setQwFeeId(Long qwFeeId) {
this.qwFeeId = qwFeeId;
}
public String getCorpName() {
return corpName;
}
public void setCorpName(String corpName) {
this.corpName = corpName;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Date getInterceptTime() {
return interceptTime;
}
public void setInterceptTime(Date interceptTime) {
this.interceptTime = interceptTime;
}
public Integer getInterceptUserNum() {
return interceptUserNum;
}
public void setInterceptUserNum(Integer interceptUserNum) {
this.interceptUserNum = interceptUserNum;
}
public Integer getPermissionUserNum() {
return permissionUserNum;
}
public void setPermissionUserNum(Integer permissionUserNum) {
this.permissionUserNum = permissionUserNum;
}
public Integer getBuyPermissionUserNum() {
return buyPermissionUserNum;
}
public void setBuyPermissionUserNum(Integer buyPermissionUserNum) {
this.buyPermissionUserNum = buyPermissionUserNum;
}
public Integer getInterceptFlag() {
return interceptFlag;
}
public void setInterceptFlag(Integer interceptFlag) {
this.interceptFlag = interceptFlag;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmClerkRelationBO.java
......@@ -15,9 +15,7 @@ public class HmClerkRelationBO implements Serializable {
private Long relationId;
private Long hmId;
private String wxUserId;
private String wxEnterpriseId;
private String enterpriseId;
......@@ -65,14 +63,6 @@ public class HmClerkRelationBO implements Serializable {
this.hmId = hmId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmQrcodeBO.java
......@@ -71,9 +71,7 @@ public class HmQrcodeBO implements Serializable {
* 微信联系我二维码
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
private String storeName;
......@@ -263,14 +261,6 @@ public class HmQrcodeBO implements Serializable {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment