Commit 2ac4ed90 by 墨竹

Merge branch 'master' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into test_branch

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
parents 6bb766cb a16078e8
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.gic</groupId>
<artifactId>gic-pom-base</artifactId>
<version>3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>haoban-manage3-api</artifactId>
<version>${libraryVersion}</version>
<name>haoban-manage3-api</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<libraryVersion>3.0-SNAPSHOT</libraryVersion>
</properties>
<distributionManagement>
<repository>
<!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name>
<!-- 这里使用 /content/repositories/snapshots/ -->
<url>http://182.254.134.223:8081/nexus/content/repositories/snapshots/</url>
<!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>-->
</repository>
<snapshotRepository>
<!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name>
<!-- 这里使用 /content/repositories/snapshots/ -->
<url>http://182.254.134.223:8081/nexus/content/repositories/Snapshots-1/</url>
<!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>-->
</snapshotRepository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-base-api</artifactId>
<version>${haoban-base-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-commons</artifactId>
<version>${gic-commons}</version>
</dependency>
</dependencies>
<build>
<finalName>haoban-manage3-api</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<!--<version>1.1.0-SNAPSHOT</version>-->
<configuration>
<flattenMode>defaults</flattenMode>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.gic</groupId>
<artifactId>gic-pom-base</artifactId>
<version>3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>haoban-manage3-api</artifactId>
<version>${libraryVersion}</version>
<name>haoban-manage3-api</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<libraryVersion>3.0-SNAPSHOT</libraryVersion>
</properties>
<distributionManagement>
<repository>
<!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name>
<url>http://10.0.0.29:8081/nexus/content/repositories/snapshots/</url>
</repository>
<snapshotRepository>
<!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name>
<url>http://10.0.0.29:8081/nexus/content/repositories/Snapshots-1/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-base-api</artifactId>
<version>${haoban-base-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-commons</artifactId>
<version>${gic-commons}</version>
</dependency>
</dependencies>
<build>
<finalName>haoban-manage3-api</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<!--<version>1.1.0-SNAPSHOT</version>-->
<configuration>
<flattenMode>defaults</flattenMode>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
......@@ -9,4 +9,13 @@ public class Manage3Constants {
* 企业微信报错日志消息路由
*/
public static final String QYWX_ERROR_MSG = "addQywxErrorLogMq";
/**
* 活码前缀
*/
public static final String HM = "HM";
/**
* 链接前缀
*/
public static final String DT = "DT";
}
package com.gic.haoban.manage.api.constants;
/**
* 描述: 数据组 api
* http://10.0.1.11:7070/config.html#/appid=data-api-config&env=DEV&cluster=default
* value: 为访问地址 ++++ token
* 案例:http://110.42.144.153:81/api/gateway/data_mkt_mvp_activityStatistics++++E488193652356772E42EAE28425914B2
*
* @author yujie
* @date 2021/12/29 16:24
*/
public interface StatisticsApolloKeyConstant {
String INTERVAL = "\\+\\+\\+\\+";
/**
* API 描述:好办活码列表
*/
String data_haoban_hm_list = "data_haoban_hm_list";
/**
* API 描述:活码数据概览
*/
String data_haoban_hm_overview = "data_haoban_hm_overview";
/**
* 活码趋势图(天)
*/
String data_haoban_hm_trend_d = "data_haoban_hm_trend_d";
/**
* 活码趋势图(月)
*/
String data_haoban_hm_trend_m = "data_haoban_hm_trend_m";
/**
* 单人活码明细
*/
String data_haoban_hm_single_detail = "data_haoban_hm_single_detail";
/**
* 多人活码列表
*/
String data_haoban_hm_many_detail = "data_haoban_hm_many_detail";
/**
* 用于链接明细导购数据 企业+链接+导购
*/
String data_haoban_link_detail = "data_haoban_link_detail";
/**
* 用于好办链接概览数据 企业+链接
*/
String data_haoban_link_overview = "data_haoban_link_overview";
/**
* 用于好办链接列表数据 企业+链接
*/
String data_haoban_link_list = "data_haoban_link_list";
}
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
public class CommonMQDTO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -5681421708810402425L;
private int type ;
private String params ;
public int getType() {
return type;
}
public String getParams() {
return params;
}
public void setType(int type) {
this.type = type;
}
public void setParams(String params) {
this.params = params;
}
}
......@@ -32,6 +32,10 @@ public class EnterpriseDetailDTO implements Serializable{
private int aclFlag = 1 ;
private int defaultFlag ;
private String conactsPhone;
private String customerPhone;
public int getDefaultFlag() {
return defaultFlag;
}
......@@ -138,6 +142,20 @@ public class EnterpriseDetailDTO implements Serializable{
public void setBrandName(String brandName) {
this.brandName = brandName;
}
public String getConactsPhone() {
return conactsPhone;
}
public void setConactsPhone(String conactsPhone) {
this.conactsPhone = conactsPhone;
}
public String getCustomerPhone() {
return customerPhone;
}
public void setCustomerPhone(String customerPhone) {
this.customerPhone = customerPhone;
}
}
......@@ -35,6 +35,8 @@ public class ExternalUserDTO implements Serializable{
*/
private Integer friendType;
private String state;
public Integer getFriendType() {
return friendType;
}
......@@ -146,8 +148,12 @@ public class ExternalUserDTO implements Serializable{
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
}
......@@ -16,6 +16,7 @@ public class KeyDataDTO implements Serializable{
private static final long serialVersionUID = 1978554156094100L;
private Long id;
private String enterpriseId ;
private String relationId;
private String dataKey;
private String data;
......@@ -23,7 +24,15 @@ public class KeyDataDTO implements Serializable{
private Integer type;
private java.util.Date createTime;
public String getRelationId() {
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getRelationId() {
return relationId;
}
......
......@@ -34,6 +34,8 @@ public class StaffClerkRelationDTO implements Serializable {
private String wxOpenUserId;
private Integer openConcatFlag;
public String getStaffClerkRelationId() {
return staffClerkRelationId;
}
......@@ -145,4 +147,15 @@ public class StaffClerkRelationDTO implements Serializable {
public void setWxOpenUserId(String wxOpenUserId) {
this.wxOpenUserId = wxOpenUserId;
}
public Integer getOpenConcatFlag() {
if(null == openConcatFlag) {
return 1 ;
}
return openConcatFlag;
}
public void setOpenConcatFlag(Integer openConcatFlag) {
this.openConcatFlag = openConcatFlag;
}
}
......@@ -97,9 +97,15 @@ public class WxEnterpriseDTO implements Serializable {
private Date agreeExternalUseridTime;
/**
* 转换状态:0:未转换;1:转换成功;2:转换中
* '转换外部联系人状态:0:未转换;1:转换成功;2:转换中;3:转换失败'
*/
private Integer externalFlag;
/**
* 转换wx_userid状态:0:未转换;1:转换成功;2:转换中;3:转换失败
*/
private Integer useridFlag;
private String enterpriseId;
public String getMemberSecret() {
return memberSecret;
......@@ -436,4 +442,20 @@ public class WxEnterpriseDTO implements Serializable {
public void setExternalFlag(Integer externalFlag) {
this.externalFlag = externalFlag;
}
public Integer getUseridFlag() {
return useridFlag;
}
public void setUseridFlag(Integer useridFlag) {
this.useridFlag = useridFlag;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
}
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
public class WxEnterpriseQwDTO implements Serializable {
private static final long serialVersionUID = 1L;
private int wxSecurityType ;
private String wxEnterpriseId;
// 企业表中的id(正常同第三方)
private String corpid;
// 好办 助手
private String dkCorpid;
private String dkSuiteId ;
// 会员小程序dk
private String memberCorpid;
private String memberSuiteId ;
// 第三方
private String thirdCorpid;
public String getDkSuiteId() {
return dkSuiteId;
}
public String getMemberSuiteId() {
return memberSuiteId;
}
public void setDkSuiteId(String dkSuiteId) {
this.dkSuiteId = dkSuiteId;
}
public void setMemberSuiteId(String memberSuiteId) {
this.memberSuiteId = memberSuiteId;
}
public int getWxSecurityType() {
return wxSecurityType;
}
public void setWxSecurityType(int wxSecurityType) {
this.wxSecurityType = wxSecurityType;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public String getCorpid() {
return corpid;
}
public String getDkCorpid() {
return dkCorpid;
}
public String getMemberCorpid() {
return memberCorpid;
}
public String getThirdCorpid() {
return thirdCorpid;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
public void setDkCorpid(String dkCorpid) {
this.dkCorpid = dkCorpid;
}
public void setMemberCorpid(String memberCorpid) {
this.memberCorpid = memberCorpid;
}
public void setThirdCorpid(String thirdCorpid) {
this.thirdCorpid = thirdCorpid;
}
}
package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
/**
* @author xuwenqian
* @date 2022/7/15 14:40
*/
public class HmClerkDTO implements Serializable {
private static final long serialVersionUID = -5700709557914308777L;
private String clerkName;
private String clerkId;
private String clerkCode;
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
}
package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
import java.util.Date;
/**
* 多人活码(TabHaobanHmClerkRelation)实体类
*
* @author mozhu
* @since 2022-07-04 15:42:20
*/
public class HmClerkRelationDTO implements Serializable {
private static final long serialVersionUID = 277698847715591316L;
private Long relationId;
private Long hmId;
private String wxUserId;
private String wxEnterpriseId;
private String enterpriseId;
private String storeId;
private String storeName;
private String storeCode;
private String clerkId;
private String clerkName;
private String clerkCode;
/**
* 1正常 0删除
*/
private Integer status;
private Date createTime;
private Date updateTime;
/**
* 是否上限1是0否
*/
private Integer overFlag;
private String staffId;
private String staffName;
public Long getRelationId() {
return relationId;
}
public void setRelationId(Long relationId) {
this.relationId = relationId;
}
public Long getHmId() {
return hmId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getOverFlag() {
return overFlag;
}
public void setOverFlag(Integer overFlag) {
this.overFlag = overFlag;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
}
......@@ -11,6 +11,7 @@ import java.io.Serializable;
public class HmGroupDTO implements Serializable {
private static final long serialVersionUID = -8687513491118069691L;
/**
* 分组id
*/
......
......@@ -10,6 +10,9 @@ import com.gic.haoban.base.api.common.BasePageInfo;
**/
public class HmGroupQueryDTO extends BasePageInfo {
private static final long serialVersionUID = 6456482769128766297L;
private String clerkId;
private String groupName;
private String enterpriseId;
......@@ -42,4 +45,12 @@ public class HmGroupQueryDTO extends BasePageInfo {
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
}
......@@ -18,7 +18,7 @@ public class HmLinkDTO implements Serializable {
private Long linkId;
private String linkCode;
/**1通用链接 2专用链接*/
/**1专用链接 2通用链接*/
private Integer linkType;
private String wxEnterpriseId;
private String enterpriseId;
......@@ -40,9 +40,17 @@ public class HmLinkDTO implements Serializable {
private String memberLabelId;
/**0删除 1正常*/
private Integer statusFlag;
private String shortCode ;
private List<HmLinkStoreDTO> storeList;
public String getShortCode() {
return shortCode;
}
public void setShortCode(String shortCode) {
this.shortCode = shortCode;
}
public List<HmLinkStoreDTO> getStoreList() {
return storeList;
}
......
package com.gic.haoban.manage.api.dto.hm;
public class HmLinkStoreSettingDTO {
// 是否开启
private int open;
// 专属
private int zs;
// 协管
private int xg ;
//店长
private int dz;
//店员
private int dy;
private int ndz;
private int ndy;
public int getXg() {
return xg;
}
public void setXg(int xg) {
this.xg = xg;
}
public int getNdz() {
return ndz;
}
public int getNdy() {
return ndy;
}
public void setNdz(int ndz) {
this.ndz = ndz;
}
public void setNdy(int ndy) {
this.ndy = ndy;
}
public int getOpen() {
return open;
......
......@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
*
......@@ -14,35 +15,104 @@ import java.util.List;
*/
public class HmLinkWxaDTO implements Serializable {
private HmPageTemplateDTO page;
private static final long serialVersionUID = 6473795387449522116L;
private Long pageId ;
private Long hmId ;
private String wxEnterpriseId ;
private String enterpriseId ;
private HmPageDTO page;
// 二维码
private String hmQrcode;
// 自定义门店规则1推荐门店 2附近门店
private int storeType;
// 是否展示省市区门店查询
private boolean selectStoreFlag;
private int selectStoreFlag;
// 推荐的门店列表
private List<HmLinkStoreDTO> storeList;
// 说明
private Map<String,String> remarkMap ;
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public List<HmLinkStoreDTO> getStoreList() {
return storeList;
public String getEnterpriseId() {
return enterpriseId;
}
public void setStoreList(List<HmLinkStoreDTO> storeList) {
this.storeList = storeList;
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public boolean isSelectStoreFlag() {
return selectStoreFlag;
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public void setSelectStoreFlag(boolean selectStoreFlag) {
this.selectStoreFlag = selectStoreFlag;
public Long getHmId() {
return hmId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public HmPageTemplateDTO getPage() {
public HmPageDTO getPage() {
return page;
}
public void setPage(HmPageTemplateDTO page) {
public void setPage(HmPageDTO page) {
this.page = page;
}
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public Map<String, String> getRemarkMap() {
return remarkMap;
}
public void setRemarkMap(Map<String, String> remarkMap) {
this.remarkMap = remarkMap;
}
public String getHmQrcode() {
return hmQrcode;
}
public void setHmQrcode(String hmQrcode) {
this.hmQrcode = hmQrcode;
}
public int getStoreType() {
return storeType;
}
public void setStoreType(int storeType) {
this.storeType = storeType;
}
public List<HmLinkStoreDTO> getStoreList() {
return storeList;
}
public void setStoreList(List<HmLinkStoreDTO> storeList) {
this.storeList = storeList;
}
public int getSelectStoreFlag() {
return selectStoreFlag;
}
public void setSelectStoreFlag(int selectStoreFlag) {
this.selectStoreFlag = selectStoreFlag;
}
}
\ No newline at end of file
......@@ -9,22 +9,24 @@ import java.util.Date;
* @Description
* @Version
**/
public class HmPageTemplateRespDTO implements Serializable {
public class HmPageDTO implements Serializable {
private static final long serialVersionUID = 8049920392780217427L;
/**
* 落地页id
*/
private Long templateId;
private Long pageId;
/**
* 落地页code
*/
private String templateCode;
private String pageCode;
/**
* 落地页模板名称
*/
private String templateName;
private String pageName;
/**
* 企业id
......@@ -58,7 +60,7 @@ public class HmPageTemplateRespDTO implements Serializable {
/**
* 页面背景图
*/
private String pageBackgroudImg;
private String pageBackgroundImg;
/**
* 引导语
......@@ -86,44 +88,28 @@ public class HmPageTemplateRespDTO implements Serializable {
private Date updateTime;
public String getTemplateCode() {
return templateCode;
public Long getPageId() {
return pageId;
}
public void setTemplateCode(String templateCode) {
this.templateCode = templateCode;
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public String getTemplateName() {
return templateName;
public String getPageCode() {
return pageCode;
}
public void setTemplateName(String templateName) {
this.templateName = templateName;
public void setPageCode(String pageCode) {
this.pageCode = pageCode;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
public String getPageName() {
return pageName;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
public void setPageName(String pageName) {
this.pageName = pageName;
}
public String getPageTitle() {
......@@ -158,12 +144,12 @@ public class HmPageTemplateRespDTO implements Serializable {
this.merchantLogo = merchantLogo;
}
public String getPageBackgroudImg() {
return pageBackgroudImg;
public String getPageBackgroundImg() {
return pageBackgroundImg;
}
public void setPageBackgroudImg(String pageBackgroudImg) {
this.pageBackgroudImg = pageBackgroudImg;
public void setPageBackgroundImg(String pageBackgroundImg) {
this.pageBackgroundImg = pageBackgroundImg;
}
public String getGuideComment() {
......@@ -174,6 +160,30 @@ public class HmPageTemplateRespDTO implements Serializable {
this.guideComment = guideComment;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getCreateorId() {
return createorId;
}
......@@ -221,12 +231,4 @@ public class HmPageTemplateRespDTO implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Long getTemplateId() {
return templateId;
}
public void setTemplateId(Long templateId) {
this.templateId = templateId;
}
}
package com.gic.haoban.manage.api.dto.hm;
import com.gic.haoban.manage.api.enums.hm.HmPageType;
import java.io.Serializable;
import java.util.Date;
/**
* @Author MUSI
......@@ -9,12 +10,13 @@ import java.util.Date;
* @Description
* @Version
**/
public class HmPageRelationRespDTO implements Serializable {
public class HmPageRelationDTO implements Serializable {
private static final long serialVersionUID = 8682427720134740563L;
/**
* 落地页模板code
*/
private String pageTemplateCode;
private String pageCode;
/**
......@@ -32,6 +34,8 @@ public class HmPageRelationRespDTO implements Serializable {
*/
private String referId;
private String referCode;
/**
* 引用方名称
*/
......@@ -40,16 +44,18 @@ public class HmPageRelationRespDTO implements Serializable {
/**
* 引用方来源
*
* @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateType
* @see HmPageType
*/
private Integer type;
public String getPageTemplateCode() {
return pageTemplateCode;
private String releationId;
public String getPageCode() {
return pageCode;
}
public void setPageTemplateCode(String pageTemplateCode) {
this.pageTemplateCode = pageTemplateCode;
public void setPageCode(String pageCode) {
this.pageCode = pageCode;
}
public String getEnterpriseId() {
......@@ -91,4 +97,20 @@ public class HmPageRelationRespDTO implements Serializable {
public void setType(Integer type) {
this.type = type;
}
public String getReleationId() {
return releationId;
}
public void setReleationId(String releationId) {
this.releationId = releationId;
}
public String getReferCode() {
return referCode;
}
public void setReferCode(String referCode) {
this.referCode = referCode;
}
}
package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 活码(TabHaobanHmQrcode)实体类
*
* @author mozhu
* @since 2022-07-04 15:42:20
*/
public class HmQrcodeDTO implements Serializable {
private static final long serialVersionUID = 887910678030827375L;
private Long hmId;
private String hmCode;
/**
* 1单人 2多人
*/
private Integer hmType;
private String wxEnterpriseId;
private String enterpriseId;
private String name;
private String creatorId;
private String creatorName;
private String modifierId;
private String modifierName;
private Date createTime;
private Date updateTime;
/**
* 会员活动标签
*/
private String memberLabelId;
/**
* 1自动通过 0否
*/
private Integer passFlag;
private String welcomeId;
/**
* 0删除 1正常 2作废 3待生效
*/
private Integer statusFlag;
/**
* 当日已加好友数
*/
private Integer addNum;
/**
* 是否达上线 1是0否
*/
private Integer overFlag;
/**
* 微信联系我id
*/
private String wxConfigId;
/**
* 微信联系我二维码
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
private String storeName;
private String storeCode;
private String clerkId;
private String clerkName;
private String clerkCode;
private String staffId;
private String staffName;
/**
* 多人活码人数
*/
private Integer hmUserNum;
/**
* 活码分组
*/
private Long hmGroupId;
private String memberLabelName;
private Integer memberLabelStatus;
private String hmGroupName;
private List<HmClerkDTO> clerkList;
private List<HmStoreDTO> storeList;
public Long getHmId() {
return hmId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public String getHmCode() {
return hmCode;
}
public void setHmCode(String hmCode) {
this.hmCode = hmCode;
}
public Integer getHmType() {
return hmType;
}
public void setHmType(Integer hmType) {
this.hmType = hmType;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCreatorId() {
return creatorId;
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorName() {
return creatorName;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
public String getModifierId() {
return modifierId;
}
public void setModifierId(String modifierId) {
this.modifierId = modifierId;
}
public String getModifierName() {
return modifierName;
}
public void setModifierName(String modifierName) {
this.modifierName = modifierName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getMemberLabelId() {
return memberLabelId;
}
public void setMemberLabelId(String memberLabelId) {
this.memberLabelId = memberLabelId;
}
public Integer getPassFlag() {
return passFlag;
}
public void setPassFlag(Integer passFlag) {
this.passFlag = passFlag;
}
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getAddNum() {
return addNum;
}
public void setAddNum(Integer addNum) {
this.addNum = addNum;
}
public Integer getOverFlag() {
return overFlag;
}
public void setOverFlag(Integer overFlag) {
this.overFlag = overFlag;
}
public String getWxConfigId() {
return wxConfigId;
}
public void setWxConfigId(String wxConfigId) {
this.wxConfigId = wxConfigId;
}
public String getWxQrcode() {
return wxQrcode;
}
public void setWxQrcode(String wxQrcode) {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public Integer getHmUserNum() {
return hmUserNum;
}
public void setHmUserNum(Integer hmUserNum) {
this.hmUserNum = hmUserNum;
}
public Long getHmGroupId() {
return hmGroupId;
}
public void setHmGroupId(Long hmGroupId) {
this.hmGroupId = hmGroupId;
}
public String getMemberLabelName() {
return memberLabelName;
}
public void setMemberLabelName(String memberLabelName) {
this.memberLabelName = memberLabelName;
}
public String getHmGroupName() {
return hmGroupName;
}
public void setHmGroupName(String hmGroupName) {
this.hmGroupName = hmGroupName;
}
public List<HmClerkDTO> getClerkList() {
return clerkList;
}
public void setClerkList(List<HmClerkDTO> clerkList) {
this.clerkList = clerkList;
}
public List<HmStoreDTO> getStoreList() {
return storeList;
}
public void setStoreList(List<HmStoreDTO> storeList) {
this.storeList = storeList;
}
public Integer getMemberLabelStatus() {
return memberLabelStatus;
}
public void setMemberLabelStatus(Integer memberLabelStatus) {
this.memberLabelStatus = memberLabelStatus;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
}
package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @author mozhu
* @date 2022/7/6 10:46
*/
public class HmQrcodeListDTO implements Serializable {
private static final long serialVersionUID = -5609169421685423604L;
private Long hmId;
private String hmCode;
/**
* 1单人 2多人
*/
private Integer hmType;
private String wxEnterpriseId;
private String enterpriseId;
private String name;
private String hmName;
private String creatorId;
private String creatorName;
private String modifierId;
private String modifierName;
private Date createTime;
private Date updateTime;
/**
* 0删除 1正常 2作废 3待生效
*/
private Integer statusFlag;
/**
* 当日已加好友数
*/
private Integer addNum;
/**
* 是否达上线 1是0否
*/
private Integer overFlag;
/**
* 微信联系我id
*/
private String wxConfigId;
/**
* 微信联系我二维码
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
private String storeName;
private String storeCode;
private String clerkId;
private String clerkName;
private String clerkCode;
/**
* 多人活码人数
*/
private Integer hmUserNum;
/**
* 活码分组
*/
private Long hmGroupId;
private String hmGroupName;
/**
* 新增总人数
*/
private Integer addNumT;
private List<HmClerkDTO> clerkList;
private List<HmStoreDTO> storeList;
public Long getHmId() {
return hmId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public String getHmCode() {
return hmCode;
}
public void setHmCode(String hmCode) {
this.hmCode = hmCode;
}
public Integer getHmType() {
return hmType;
}
public void setHmType(Integer hmType) {
this.hmType = hmType;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCreatorId() {
return creatorId;
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorName() {
return creatorName;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
public String getModifierId() {
return modifierId;
}
public void setModifierId(String modifierId) {
this.modifierId = modifierId;
}
public String getModifierName() {
return modifierName;
}
public void setModifierName(String modifierName) {
this.modifierName = modifierName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getAddNum() {
return addNum;
}
public void setAddNum(Integer addNum) {
this.addNum = addNum;
}
public Integer getOverFlag() {
return overFlag;
}
public void setOverFlag(Integer overFlag) {
this.overFlag = overFlag;
}
public String getWxConfigId() {
return wxConfigId;
}
public void setWxConfigId(String wxConfigId) {
this.wxConfigId = wxConfigId;
}
public String getWxQrcode() {
return wxQrcode;
}
public void setWxQrcode(String wxQrcode) {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public Integer getHmUserNum() {
return hmUserNum;
}
public void setHmUserNum(Integer hmUserNum) {
this.hmUserNum = hmUserNum;
}
public Long getHmGroupId() {
return hmGroupId;
}
public void setHmGroupId(Long hmGroupId) {
this.hmGroupId = hmGroupId;
}
public Integer getAddNumT() {
return addNumT;
}
public void setAddNumT(Integer addNumT) {
this.addNumT = addNumT;
}
public List<HmClerkDTO> getClerkList() {
return clerkList;
}
public void setClerkList(List<HmClerkDTO> clerkList) {
this.clerkList = clerkList;
}
public List<HmStoreDTO> getStoreList() {
return storeList;
}
public void setStoreList(List<HmStoreDTO> storeList) {
this.storeList = storeList;
}
public String getHmGroupName() {
return hmGroupName;
}
public void setHmGroupName(String hmGroupName) {
this.hmGroupName = hmGroupName;
}
public String getHmName() {
return hmName;
}
public void setHmName(String hmName) {
this.hmName = hmName;
}
}
package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
/**
* @author mozhu
* @date 2022/7/8 15:05
*/
public class HmQrcodeStoreDTO implements Serializable {
private static final long serialVersionUID = -6704478183404897385L;
private String enterpriseId;
private Integer overFlag;
private String storeName;
private String storeId;
private String storeCode;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Integer getOverFlag() {
return overFlag;
}
public void setOverFlag(Integer overFlag) {
this.overFlag = overFlag;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
}
package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
/**
* @author xuwenqian
* @date 2022/7/15 14:40
*/
public class HmStoreDTO implements Serializable {
private static final long serialVersionUID = -5700709557914308777L;
private String storeId;
private String storeName;
private String storeCode;
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
}
......@@ -10,23 +10,26 @@ import java.io.Serializable;
**/
public class HmWelcomeRelationDTO implements Serializable {
private Long relationId;
private static final long serialVersionUID = 6717298152613202083L;
private String relationId;
private String referName;
private String referId;
private String referCode;
private Integer type;
private String typeText;
private Integer status;
public Long getRelationId() {
public String getRelationId() {
return relationId;
}
public void setRelationId(Long relationId) {
public void setRelationId(String relationId) {
this.relationId = relationId;
}
......@@ -69,4 +72,12 @@ public class HmWelcomeRelationDTO implements Serializable {
public void setStatus(Integer status) {
this.status = status;
}
public String getReferCode() {
return referCode;
}
public void setReferCode(String referCode) {
this.referCode = referCode;
}
}
package com.gic.haoban.manage.api.dto.qdto;
import java.io.Serializable;
/**
* 导购删除、门店转移、新增修改店长
*
* @author mozhu
* @date 2022-07-15 10:33:15
*/
public class ClerkSyncQDTO implements Serializable {
private static final long serialVersionUID = 3952563675969267345L;
private String clerkId;
private String storeId;
private String clerkCode;
private String enterpriseId;
private Integer status;
private Integer oldStatus;
/**
* 1:删除;2:门店转移;3:导购其他数据变动
*/
private Integer type;
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getOldStatus() {
return oldStatus;
}
public void setOldStatus(Integer oldStatus) {
this.oldStatus = oldStatus;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
}
package com.gic.haoban.manage.api.dto.qdto.hm;
import java.io.Serializable;
import java.util.Date;
/**
* 多人活码(TabHaobanHmClerkRelation)实体类
*
* @author mozhu
* @since 2022-07-04 15:42:20
*/
public class HmClerkRelationQDTO implements Serializable {
private static final long serialVersionUID = -101673102932899579L;
private Long relationId;
private Long hmId;
private String wxUserId;
private String wxEnterpriseId;
private String enterpriseId;
private String storeId;
private String storeName;
private String storeCode;
private String clerkId;
private String clerkName;
private String clerkCode;
/**
* 1正常 0删除
*/
private Integer status;
private Date createTime;
private Date updateTime;
/**
* 是否上限1是0否
*/
private Integer overFlag;
private Integer addNum;
private String staffId;
private String staffName;
public Long getRelationId() {
return relationId;
}
public void setRelationId(Long relationId) {
this.relationId = relationId;
}
public Long getHmId() {
return hmId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getOverFlag() {
return overFlag;
}
public void setOverFlag(Integer overFlag) {
this.overFlag = overFlag;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public Integer getAddNum() {
return addNum;
}
public void setAddNum(Integer addNum) {
this.addNum = addNum;
}
}
......@@ -16,6 +16,26 @@ public class HmLinkSearchQDTO implements Serializable {
private String enterpriseId;
private String searchParams;
private Integer linkType;
private String sortColumn ;
private String sortType ;
private Long linkId;
private String storeId;
public String getSortColumn() {
return sortColumn;
}
public String getSortType() {
return sortType;
}
public void setSortColumn(String sortColumn) {
this.sortColumn = sortColumn;
}
public void setSortType(String sortType) {
this.sortType = sortType;
}
public Date getStartDate() {
return startDate;
......@@ -64,4 +84,22 @@ public class HmLinkSearchQDTO implements Serializable {
public void setLinkType(Integer linkType) {
this.linkType = linkType;
}
public Long getLinkId() {
return linkId;
}
public HmLinkSearchQDTO setLinkId(Long linkId) {
this.linkId = linkId;
return this;
}
public String getStoreId() {
return storeId;
}
public HmLinkSearchQDTO setStoreId(String storeId) {
this.storeId = storeId;
return this;
}
}
package com.gic.haoban.manage.api.dto.hm;
package com.gic.haoban.manage.api.dto.qdto.hm;
import com.gic.haoban.base.api.common.BasePageInfo;
......@@ -10,8 +10,9 @@ import java.util.Date;
* @Description
* @Version
**/
public class HmPageQueryDTO extends BasePageInfo {
public class HmPageQDTO extends BasePageInfo {
private static final long serialVersionUID = 7554464387425111232L;
private String pageSearchText;
/**
......
package com.gic.haoban.manage.api.dto.hm;
package com.gic.haoban.manage.api.dto.qdto.hm;
import com.gic.haoban.base.api.common.BasePageInfo;
......@@ -8,8 +8,9 @@ import com.gic.haoban.base.api.common.BasePageInfo;
* @Description
* @Version
**/
public class HmPageRelationQueryDTO extends BasePageInfo {
public class HmPageRelationQDTO extends BasePageInfo {
private static final long serialVersionUID = -7239030561346484410L;
private String searchText;
/**
......@@ -22,6 +23,11 @@ public class HmPageRelationQueryDTO extends BasePageInfo {
*/
private String wxEnterpriseId;
/**
* 落地页模板id
*/
private Long pageId;
public String getEnterpriseId() {
return enterpriseId;
}
......@@ -45,4 +51,12 @@ public class HmPageRelationQueryDTO extends BasePageInfo {
public void setSearchText(String searchText) {
this.searchText = searchText;
}
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
}
package com.gic.haoban.manage.api.dto.qdto.hm;
import com.gic.haoban.base.api.common.BasePageInfo;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 活码(TabHaobanHmQrcode)实体类
*
* @author mozhu
* @since 2022-07-04 15:42:20
*/
public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
private static final long serialVersionUID = 887910678030827375L;
private Long hmId;
/**
* 1单人 2多人
*/
private Integer hmTypeInt;
private String wxEnterpriseId;
private String enterpriseId;
private String hmSelect;
private String storeSelect;
private String clerkSelect;
private Date startTime;
private Date endTime;
/**
* 0删除 1正常 2作废 3待生效
*/
private Integer statusFlagInt;
private String orderByField;
/**
* 活码分组
*/
private Long hmGroupId;
private Integer pageNo;
private List<String> storeId;
public Long getHmId() {
return hmId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public Integer getHmTypeInt() {
return hmTypeInt;
}
public void setHmTypeInt(Integer hmTypeInt) {
this.hmTypeInt = hmTypeInt;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getHmSelect() {
return hmSelect;
}
public void setHmSelect(String hmSelect) {
this.hmSelect = hmSelect;
}
public String getStoreSelect() {
return storeSelect;
}
public void setStoreSelect(String storeSelect) {
this.storeSelect = storeSelect;
}
public String getClerkSelect() {
return clerkSelect;
}
public void setClerkSelect(String clerkSelect) {
this.clerkSelect = clerkSelect;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Integer getStatusFlagInt() {
return statusFlagInt;
}
public void setStatusFlagInt(Integer statusFlagInt) {
this.statusFlagInt = statusFlagInt;
}
public String getOrderByField() {
return orderByField;
}
public void setOrderByField(String orderByField) {
this.orderByField = orderByField;
}
public Long getHmGroupId() {
return hmGroupId;
}
public void setHmGroupId(Long hmGroupId) {
this.hmGroupId = hmGroupId;
}
public List<String> getStoreId() {
return storeId;
}
public void setStoreId(List<String> storeId) {
this.storeId = storeId;
}
public Integer getPageNo() {
return pageNo;
}
public void setPageNo(Integer pageNo) {
this.pageNo = pageNo;
}
}
package com.gic.haoban.manage.api.dto.qdto.hm;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 活码(TabHaobanHmQrcode)实体类
*
* @author mozhu
* @since 2022-07-04 15:42:20
*/
public class HmQrcodeQDTO implements Serializable {
private static final long serialVersionUID = 887910678030827375L;
private Long hmId;
private String hmCode;
/**
* 1单人 2多人
*/
private Integer hmType;
private String wxEnterpriseId;
private String enterpriseId;
private String name;
private String creatorId;
private String creatorName;
private String modifierId;
private String modifierName;
private Date createTime;
private Date updateTime;
/**
* 会员活动标签
*/
private String memberLabelId;
/**
* 1自动通过 0否
*/
private Integer passFlag;
private String welcomeId;
/**
* 0删除 1正常 2作废 3待生效(是否开启联系我)
*/
private Integer statusFlag;
/**
* 当日已加好友数
*/
private Integer addNum;
/**
* 是否达上线 1是0否
*/
private Integer overFlag;
/**
* 微信联系我id
*/
private String wxConfigId;
/**
* 微信联系我二维码
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
private String storeName;
private String storeCode;
private String clerkId;
private String clerkName;
private String clerkCode;
/**
* 多人活码人数
*/
private Integer hmUserNum;
/**
* 活码分组
*/
private Long hmGroupId;
/**
* 导购id列表
*/
private List<String> clerkIdList;
private String staffId;
private String staffName;
/**
* 调用类型来源 0:不记录,1:来源为后台操作 其他查看枚举 ChannelCodeEnum
*/
private Integer invokingType = 0;
/**
* 多人活码新增员工
*/
private String addStaffName;
private WebLoginDTO webLoginDTO;
public Long getHmId() {
return hmId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public String getHmCode() {
return hmCode;
}
public void setHmCode(String hmCode) {
this.hmCode = hmCode;
}
public Integer getHmType() {
return hmType;
}
public void setHmType(Integer hmType) {
this.hmType = hmType;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCreatorId() {
return creatorId;
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorName() {
return creatorName;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
public String getModifierId() {
return modifierId;
}
public void setModifierId(String modifierId) {
this.modifierId = modifierId;
}
public String getModifierName() {
return modifierName;
}
public void setModifierName(String modifierName) {
this.modifierName = modifierName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getMemberLabelId() {
return memberLabelId;
}
public void setMemberLabelId(String memberLabelId) {
this.memberLabelId = memberLabelId;
}
public Integer getPassFlag() {
return passFlag;
}
public void setPassFlag(Integer passFlag) {
this.passFlag = passFlag;
}
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getAddNum() {
return addNum;
}
public void setAddNum(Integer addNum) {
this.addNum = addNum;
}
public Integer getOverFlag() {
return overFlag;
}
public void setOverFlag(Integer overFlag) {
this.overFlag = overFlag;
}
public String getWxConfigId() {
return wxConfigId;
}
public void setWxConfigId(String wxConfigId) {
this.wxConfigId = wxConfigId;
}
public String getWxQrcode() {
return wxQrcode;
}
public void setWxQrcode(String wxQrcode) {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public Integer getHmUserNum() {
return hmUserNum;
}
public void setHmUserNum(Integer hmUserNum) {
this.hmUserNum = hmUserNum;
}
public Long getHmGroupId() {
return hmGroupId;
}
public void setHmGroupId(Long hmGroupId) {
this.hmGroupId = hmGroupId;
}
public List<String> getClerkIdList() {
return clerkIdList;
}
public void setClerkIdList(List<String> clerkIdList) {
this.clerkIdList = clerkIdList;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public Integer getInvokingType() {
return invokingType;
}
public void setInvokingType(Integer invokingType) {
this.invokingType = invokingType;
}
public String getAddStaffName() {
return addStaffName;
}
public void setAddStaffName(String addStaffName) {
this.addStaffName = addStaffName;
}
public WebLoginDTO getWebLoginDTO() {
return webLoginDTO;
}
public void setWebLoginDTO(WebLoginDTO webLoginDTO) {
this.webLoginDTO = webLoginDTO;
}
}
package com.gic.haoban.manage.api.dto.qdto.hm;
import java.io.Serializable;
public class WxUserAddLogQDTO implements Serializable{
private static final long serialVersionUID = 6498410171325260068L;
private String wxEnterpriseId;
private String enterpriseId;
private String memberId;
private String unionid;
private Long linkId;
private Long hmId;
private boolean delFlag;
private String externalUserid;
private String wxUserId;
private String staffId;
private String staffName;
private String clerkId;
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public String getMemberId() {
return memberId;
}
public String getUnionid() {
return unionid;
}
public Long getLinkId() {
return linkId;
}
public Long getHmId() {
return hmId;
}
public boolean isDelFlag() {
return delFlag;
}
public String getExternalUserid() {
return externalUserid;
}
public String getWxUserId() {
return wxUserId;
}
public String getStaffId() {
return staffId;
}
public String getStaffName() {
return staffName;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public void setUnionid(String unionid) {
this.unionid = unionid;
}
public void setLinkId(Long linkId) {
this.linkId = linkId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public void setDelFlag(boolean delFlag) {
this.delFlag = delFlag;
}
public void setExternalUserid(String externalUserid) {
this.externalUserid = externalUserid;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
}
package com.gic.haoban.manage.api.dto.qdto.hm;
import java.io.Serializable;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gic.api.base.commons.BasePageInfo;
public class WxUserAddLogSearchQDTO extends BasePageInfo implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = 8305835283985272207L;
private String wxEnterpriseId;
private String enterpriseId;
private Long linkId;
private Long hmId;
private String clerkId;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
private Integer addChannel;
// 1添加 2流失
private int statusFlag = 1 ;
private String createTimeOrder = "desc";
public int getStatusFlag() {
if(0==statusFlag) {
return 1 ;
}
return statusFlag;
}
public void setStatusFlag(int statusFlag) {
this.statusFlag = statusFlag;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Long getLinkId() {
return linkId;
}
public Long getHmId() {
return hmId;
}
public String getClerkId() {
return clerkId;
}
public Date getStartTime() {
return startTime;
}
public Date getEndTime() {
return endTime;
}
public Integer getAddChannel() {
return addChannel;
}
public void setLinkId(Long linkId) {
this.linkId = linkId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public void setAddChannel(Integer addChannel) {
this.addChannel = addChannel;
}
public String getCreateTimeOrder() {
return createTimeOrder;
}
public void setCreateTimeOrder(String createTimeOrder) {
this.createTimeOrder = createTimeOrder;
}
}
package com.gic.haoban.manage.api.dto.statistics;
import com.gic.api.base.commons.Constant;
import org.apache.commons.collections.CollectionUtils;
import java.io.Serializable;
import java.util.List;
/**
* @author BaiShan
* @since 2022-01-06 14:15
*/
public class StatisticsDTO<T> implements Serializable {
private static final long serialVersionUID = -1988630310497970760L;
private List<T> data;
private Boolean success;
private Integer errorCode;
private String errorInfo;
private StatisticsPage page;
private Integer space;
public T getOne() {
if (CollectionUtils.isEmpty(data)) {
return null;
}
return data.get(Constant.NUMBER_0);
}
public void setData(List<T> data) {
this.data = data;
}
public List<T> getData() {
return data;
}
public Boolean getSuccess() {
return success;
}
public void setSuccess(Boolean success) {
this.success = success;
}
public Integer getErrorCode() {
return errorCode;
}
public void setErrorCode(Integer errorCode) {
this.errorCode = errorCode;
}
public String getErrorInfo() {
return errorInfo;
}
public void setErrorInfo(String errorInfo) {
this.errorInfo = errorInfo;
}
public StatisticsPage getPage() {
return page;
}
public void setPage(StatisticsPage page) {
this.page = page;
}
public Integer getSpace() {
return space;
}
public void setSpace(Integer space) {
this.space = space;
}
@Override
public String toString() {
return "StatisticsDTO{" +
"data=" + data +
", success=" + success +
", errorCode=" + errorCode +
", errorInfo='" + errorInfo + '\'' +
", page=" + page +
", space=" + space +
'}';
}
}
package com.gic.haoban.manage.api.dto.statistics;
import java.io.Serializable;
/**
* Auto-generated: 2022-01-06 14:14:52
*
* @author json.cn (i@json.cn)
*/
public class StatisticsPage implements Serializable {
private static final long serialVersionUID = 782947970893704488L;
private int totalPage;
private int pageSize;
private int totalCount;
private int currentPage;
@Override
public String toString() {
return "StatisticsPage{" +
"totalPage=" + totalPage +
", pageSize=" + pageSize +
", totalCount=" + totalCount +
", currentPage=" + currentPage +
'}';
}
public void setTotalPage(int totalPage) {
this.totalPage = totalPage;
}
public int getTotalPage() {
return totalPage;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageSize() {
return pageSize;
}
public void setTotalCount(int totalCount) {
this.totalCount = totalCount;
}
public int getTotalCount() {
return totalCount;
}
public void setCurrentPage(int currentPage) {
this.currentPage = currentPage;
}
public int getCurrentPage() {
return currentPage;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.statistics;
import java.io.Serializable;
/**
* 描述: StatisticsPageDTO
*
* @author yujie
* @date 2021/12/29 20:33
*/
public class StatisticsPageDTO implements Serializable {
private static final long serialVersionUID = 7915429898054727383L;
/**
* 页码
*/
private Integer pageNo;
/**
* 每页数量
*/
private Integer pageSize;
/**
* 查询条件
*/
public Object inFields;
public Integer getPageNo() {
return pageNo;
}
public void setPageNo(Integer pageNo) {
this.pageNo = pageNo;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Object getInFields() {
return inFields;
}
public void setInFields(Object inFields) {
this.inFields = inFields;
}
public void intPageParameterDefault() {
this.pageNo = 1;
this.pageSize = 10;
}
public void intPageParameterOne() {
this.pageNo = 1;
this.pageSize = 1;
}
public void intPageParameterMaxSize() {
this.pageNo = 1;
this.pageSize = Integer.MAX_VALUE;
}
@Override
public String toString() {
return "StatisticsPageDTO{" +
"pageNo=" + pageNo +
", pageSize=" + pageSize +
", inFields=" + inFields +
'}';
}
}
......@@ -35,6 +35,11 @@ public class WelcomeDetailDTO implements Serializable {
* 默认欢迎语标记 1是 0否
*/
private Integer defaultWelcomeFlag;
/**
* 欢迎语类型
*/
private Integer type;
/**
* 适用部门列表
*/
......@@ -120,6 +125,14 @@ public class WelcomeDetailDTO implements Serializable {
this.defaultWelcomeFlag = defaultWelcomeFlag;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
@Override
public String toString() {
return "WelcomeDetailDTO{" +
......
......@@ -66,6 +66,8 @@ public class WelcomeListDTO implements Serializable {
*/
private List<WelcomeMediaDTO> welcomeMediaList;
private Integer type;
public String getModifierId() {
return modifierId;
}
......@@ -208,4 +210,12 @@ public class WelcomeListDTO implements Serializable {
", welcomeMediaList=" + welcomeMediaList +
'}';
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
}
package com.gic.haoban.manage.api.dto.welcome.dto;
import java.io.Serializable;
/**
* @Author MUSI
* @Date 2022/7/8 9:07 AM
* @Description
* @Version
* 活码删除失败时返回对象
**/
public class WelcomeRemoveCheckDTO implements Serializable {
private static final long serialVersionUID = 6300468958582699365L;
/**
* 活码引用数量
*/
private Integer qrCodeReferNum;
/**
* 链接引用次数
*/
private Integer linkReferNum;
public Integer getQrCodeReferNum() {
return qrCodeReferNum;
}
public void setQrCodeReferNum(Integer qrCodeReferNum) {
this.qrCodeReferNum = qrCodeReferNum;
}
public Integer getLinkReferNum() {
return linkReferNum;
}
public void setLinkReferNum(Integer linkReferNum) {
this.linkReferNum = linkReferNum;
}
}
......@@ -10,13 +10,23 @@ import com.gic.haoban.base.api.common.BasePageInfo;
**/
public class QueryWelcomeRelationQDTO extends BasePageInfo {
private Long welcomeId ;
private String welcomeId ;
public Long getWelcomeId() {
private String searchContent;
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(Long welcomeId) {
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
}
public String getSearchContent() {
return searchContent;
}
public void setSearchContent(String searchContent) {
this.searchContent = searchContent;
}
}
......@@ -4,18 +4,22 @@ package com.gic.haoban.manage.api.enums;
* Created by hua on 2020/6/24.
*/
public enum ChannelCodeEnum {
/**
* 好办绑定 解绑类型
*/
ADMIN_BIND(1001,"后台管理员绑定"),
SELF_BIND(1002,"好办客户端绑定"),
AUDIT_BIND(1003,"审核绑定"),
SELF_BIND(1002,"好办小程序绑定"),
AUDIT_BIND(1003,"后台审核绑定"),
SYNC_BIND(1004,"GIC同步绑定"),
ADMIN_UNBIND(2001,"后台管理员解绑"),
SELF_UNBIND(2002,"好办客户端解绑"),
SELF_UNBIND(2002,"好办小程序解绑"),
SYNC_UNBIND(2003,"GIC同步解绑"),
WEIXIN_DEL(2004,"微信删除解绑"),
AUDIT_UNBIND(2005,"审核解绑"),
RIGHT_CHANGE_UNBIND(2006, "权限变更解绑"),
STORE_CHANGE_UNBIND(2007, "门店变更解绑"),
// CHANGR_RIGHT_UNBIND(2005,"审核解绑"),
WEIXIN_DEL(2004,"员工离职解绑"),
AUDIT_UNBIND(2005,"后台审核解绑"),
RIGHT_CHANGE_UNBIND(2006, "好办门店权限变更解绑"),
STORE_CHANGE_UNBIND(2007, "GIC门店变更解绑"),
GIC_CLERK_DEL_UNBIND(2008, "GIC导购删除解绑"),
;
private int code;
private String name;
......@@ -41,6 +45,7 @@ public enum ChannelCodeEnum {
this.name = name;
}
public static String getNameByCode(int code) {
ChannelCodeEnum[] values = ChannelCodeEnum.values();
for (ChannelCodeEnum channelCodeEnum : values) {
......
......@@ -36,4 +36,13 @@ public enum WelcomeMediaTypeEnum implements Serializable {
public String getDesc() {
return desc;
}
public static String getDescByCode(Integer code){
for (WelcomeMediaTypeEnum welcomeMediaTypeEnum : values()) {
if (welcomeMediaTypeEnum.getCode().equals(code)){
return welcomeMediaTypeEnum.getDesc();
}
}
return "";
}
}
......@@ -6,7 +6,7 @@ package com.gic.haoban.manage.api.enums.hm;
* @Description
* @Version
**/
public enum HmPageTemplateStatus {
public enum HmPageStatus {
/**
......@@ -18,7 +18,7 @@ public enum HmPageTemplateStatus {
* 删除
*/
DISABLE(0, "禁用");
HmPageTemplateStatus(Integer code, String desc){
HmPageStatus(Integer code, String desc){
this.code = code;
this.desc = desc;
}
......
......@@ -6,11 +6,11 @@ package com.gic.haoban.manage.api.enums.hm;
* @Description
* @Version
**/
public enum HmPageTemplateType {
public enum HmPageType {
LINK(1, "引流链接");
HmPageTemplateType(Integer code, String desc){
HmPageType(Integer code, String desc){
this.code = code;
this.desc = desc;
}
......
package com.gic.haoban.manage.api.service;
import com.gic.haoban.manage.api.dto.CommonMQDTO;
/**
*
* @ClassName: HaobanCommonMQApiService
* @Description: 好办通用MQ
* @author xugh
* @date 2022年7月25日 下午2:27:06
*
*/
public interface HaobanCommonMQApiService {
public void commonHandler(CommonMQDTO dto) ;
}
package com.gic.haoban.manage.api.service;
import com.gic.api.base.commons.ServiceResponse;
/**
*
* @ClassName: HaobanTimerApiService
* @Description: 好办定时入口
* @author xugh
* @date 2022年7月16日 上午9:25:11
*
*/
public interface HaobanTimerApiService {
/**
*
* @Title: deleteTempWxHm
* @Description: 定时删除企微临时活码
* @author xugh
* @param params
* @return
* @throws
*/
public ServiceResponse<Void> deleteTempWxHm(String params) ;
}
package com.gic.haoban.manage.api.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.enums.KeyDataEnum;
public interface KeyDataApiService {
public ServiceResponse<String> saveMobileData(Long linkId, String mobile);
public ServiceResponse<String> getDataByKey(String key, KeyDataEnum dataEnum);
public ServiceResponse<String> getMobile(Long linkId, String key);
/**
*
* @Title: saveMobileData
* @Description: 手机号加密
* @author xugh
* @param enterpiseId
* @param linkShortCode
* @param mobile
* @return
* @throws
*/
public ServiceResponse<String> saveMobileData(String enterpiseId, String linkShortCode, String mobile);
}
......@@ -308,4 +308,16 @@ 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);
}
......@@ -39,7 +39,12 @@ public interface StaffClerkRelationApiService {
StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId);
/**
* 审核绑定
* @param staffClerkRelation
* @param optStaffId
* @param chanelCode
*/
void delAndInsert(StaffClerkRelationDTO staffClerkRelation, String optStaffId, int chanelCode);
/**
......@@ -49,7 +54,7 @@ public interface StaffClerkRelationApiService {
* @param clerkCode
* @return
*/
String delByStoreIdAndCode(String storeId, String clerkCode);
void delByStoreIdAndCode(String storeId, String clerkCode);
StaffClerkRelationDTO getOneByClerkId(String clerkId);
......@@ -173,4 +178,39 @@ public interface StaffClerkRelationApiService {
* @date 2022-06-20 22:46:46
*/
List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId,String staffId);
/**
* 通过职员id 查询职员id列表
*
* @param clerkIds 职员id
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link StaffClerkRelationDTO }>
* @author mozhu
* @date 2022-07-07 17:28:01
*/
List<StaffClerkRelationDTO> listClerkIdConcatFlagByClerkIds(List<String> clerkIds,String wxEnterpriseId);
/**
* 导购门店转移或者删除
* clerkStoreMoveDelMq
*
* @param param 参数
* @author mozhu
* @date 2022-07-12 18:57:15
*/
void clerkStoreMoveDel(String param);
/**
*
* @Title: getCanAddHmCount
* @Description: 获取能创建活码的导购数量
* @author xugh
* @param enterpriseId
* @param wxEnterpriseId
* @return
* @throws
*/
int getCanAddHmCount(String enterpriseId , String wxEnterpriseId , String clerkId) ;
}
......@@ -33,7 +33,7 @@ public interface TestApiService {
* @param methodName
* @param cron
*/
void quartzTaskConvert(String serviceName, String methodName, String cron, String params);
void quartzTaskConvert(String serviceName, String methodName, String cron, String params,String referId);
/**
......
package com.gic.haoban.manage.api.service;
import java.util.List;
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.List;
public interface WxEnterpriseRelatedApiService {
/**
......@@ -48,6 +48,7 @@ public interface WxEnterpriseRelatedApiService {
/**
* 异步刷新门店
* "routerName": "flushHaobanBindStoreMq"
*
* @param message
*/
......@@ -157,4 +158,12 @@ public interface WxEnterpriseRelatedApiService {
public List<String> listStoreIdByName(String wxEnterpriseId, String enterpriseId , String storeName);
/**
* 查询当前商户信息
* @param wxEnterpriseId
* @param enterpriseId
* @return
*/
com.gic.api.base.commons.ServiceResponse<EnterpriseDetailDTO> queryEnterpriseDetail(String wxEnterpriseId, String enterpriseId);
}
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
import java.util.List;
/**
* 多人活码
*
* @author mozhu
* @date 2022-08-05 17:02:54
*/
public interface HmClerkRelationApiService {
/**
* 导购解绑作废
*
* @param clerkId
* @param enterpriseId 企业标识
* @param wxEnterpriseId wx企业标识
* @param invokingType 调用类型
* @return {@link ServiceResponse }
* @author mozhu
* @date 2022-07-22 15:14:51
*/
ServiceResponse delByClerkId(String clerkId,String enterpriseId,String wxEnterpriseId,Integer invokingType);
/**
* 根据导购信息获取hmid
*
* @param basePageInfo 基本信息页
* @param hmId hm id
* @return {@link List }<{@link HmClerkRelationDTO }>
* @author mozhu
* @date 2022-07-15 14:31:03
*/
Page<HmClerkRelationDTO> getHmClerkByHmId(BasePageInfo basePageInfo, Long hmId);
/**
* 根据活码id和导购id查询数据
*
* @param hmId hm id
* @param clerkId 职员id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 16:36:29
*/
HmClerkRelationDTO getHmClerkByHmIdAndClerkId(Long hmId, String clerkId);
/**
* 根据活码id随机找一个
*
* @param hmId hm id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 16:48:42
*/
HmClerkRelationDTO getOneHmClerkByHmId(Long hmId);
/**
* 根据活码id和staffId随机找一个
*
* @param hmId hm id
* @param staffId 员工id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 17:24:01
*/
HmClerkRelationDTO getOneHmClerkByHmIdAndStaffId(Long hmId,String staffId);
}
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
import com.gic.haoban.manage.api.dto.hm.HmGroupQueryDTO;
import java.util.List;
/**
* @Author MUSI
* @Date 2022/7/1 2:35 PM
......@@ -44,5 +46,20 @@ public interface HmGroupApiService {
* @param wxEnterpriseId
* @return
*/
ServiceResponse<Integer> queryGroupReferCount(String enterpriseId, String wxEnterpriseId);
ServiceResponse<Integer> queryGroupTotalReferCount(String clerkId, String enterpriseId, String wxEnterpriseId);
/**
* 查询单个分组信息
* @param groupId
* @return
*/
ServiceResponse<HmGroupDTO> queryGroupDetail(Long groupId);
/**
* 根据名称查询groupName
* @param groupName
* @param enterpriseId
* @return
*/
ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String wxEnterpriseId, String enterpriseId, String groupName);
}
\ No newline at end of file
......@@ -18,8 +18,12 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
*
*/
public interface HmLinkApiService {
public ServiceResponse<String> getHmLinkUrl() ;
public ServiceResponse<HmLinkDTO> getByLinkId(String wxEnterpriseId, String enterprieId, Long linkId);
public ServiceResponse<HmLinkDTO> getByShortCode(String shortCode);
/**
*
......@@ -32,20 +36,22 @@ public interface HmLinkApiService {
* @return
* @throws
*/
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName);
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
Integer linkType);
public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
public ServiceResponse<HmLinkDTO> save(HmLinkDTO dto);
public ServiceResponse<String> save(HmLinkDTO dto);
/**
*
* @Title: getLinkHm
* @Description: 小程序获取展示活码
* @author xugh
* @param whitchStore 1推荐门店 2附件门店 3省市区门店
* @return
* @throws
*/
public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, String storeId, String clerkId,
String linkId, String mixPhone, String unionid);
public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, Integer whitchStore, String storeId,
String clerkId, String linkShortCode, String mixPhone, String unionid , String memberId);
}
......@@ -4,6 +4,6 @@ import com.gic.api.base.commons.ServiceResponse;
public interface HmLinkVisitLogApiService {
public ServiceResponse<Void> save(String unionid, Long linkId);
public ServiceResponse<Void> save(String enterpriseId ,String unionid, String linkShortCode);
}
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmPageQueryDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationQueryDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationRespDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO;
import javax.xml.ws.Service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
/**
* @Author MUSI
......@@ -16,23 +13,24 @@ import javax.xml.ws.Service;
* @Description
* @Version 落地页相关
**/
public interface HmPageTemplateApiService {
public interface HmPageApiService {
/**
* 保存/修改 落地页模板
*
* @param pageTemplateDTO
* @param hmPageDTO
* @return
*/
ServiceResponse<Long> saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO);
ServiceResponse<Long> saveOrUpdateHmPage(HmPageDTO hmPageDTO);
/**
* 删除 活码落地页
*
* @param pageTemplateDTO
* @param pageDTO
* @return
*/
ServiceResponse<Boolean> deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO);
ServiceResponse<Boolean> deleteHmPage(HmPageDTO pageDTO);
/**
......@@ -41,13 +39,20 @@ public interface HmPageTemplateApiService {
* @param pageQueryDTO
* @return
*/
ServiceResponse<Page<HmPageTemplateRespDTO>> queryPageTemplateList(HmPageQueryDTO pageQueryDTO);
ServiceResponse<Page<HmPageDTO>> queryPageList(HmPageQDTO pageQueryDTO);
/**
* 条件查询落地页关联详情
* @param relationQueryDTO
* @return
*/
ServiceResponse<Page<HmPageRelationRespDTO>> queryPageRelation(HmPageRelationQueryDTO relationQueryDTO);
ServiceResponse<Page<HmPageRelationDTO>> queryPageRelation(HmPageRelationQDTO relationQueryDTO);
/**
* 根据页面id 查询
* @param pageId
* @return
*/
ServiceResponse<HmPageDTO> queryPageDetail(Long pageId);
}
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeStoreDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
import java.util.List;
/**
* @author mozhu
* @date 2022/7/5 09:33
*/
public interface HmQrcodeApiService {
/**
* 添加
*
* @param hmQrcodeQDTO hm qrcode qdto
* @return int
* @author mozhu
* @date 2022-07-05 10:59:08
*/
ServiceResponse add(HmQrcodeQDTO hmQrcodeQDTO);
/**
* 批量创建单人码
*
* @param hmQrcodeQDTO hm qrcode qdto
* @return {@link ServiceResponse }
* @author mozhu
* @date 2022-07-15 13:48:15
*/
ServiceResponse addList(HmQrcodeQDTO hmQrcodeQDTO);
/**
* 更新
*
* @param hmQrcodeQDTO hm qrcode qdto
* @return int
* @author mozhu
* @date 2022-07-05 10:59:06
*/
ServiceResponse update(HmQrcodeQDTO hmQrcodeQDTO);
/**
* 查询详情
*
* @param hmId hb id
* @return {@link HmQrcodeDTO }
* @author mozhu
* @date 2022-07-05 10:59:03
*/
HmQrcodeDTO getDetailById(Long hmId);
/**
* 查询详情简单
*
* @param hmId hm id
* @return {@link HmQrcodeDTO }
* @author mozhu
* @date 2022-07-15 16:32:10
*/
HmQrcodeDTO getSimpleById(Long hmId);
/**
* 作废
*
* @param hmId hm id
* @param invokingType 调用类型
* @return {@link ServiceResponse }
* @author mozhu
* @date 2022-07-22 15:10:42
*/
ServiceResponse delById(Long hmId, Integer invokingType, WebLoginDTO loginDTO);
/**
* 通过id添加num
*
* @param hmId hm id
* @param clerkId 职员id
* @return int
* @author mozhu
* @date 2022-07-07 11:14:53
*/
int updateAddNumById(Long hmId, String clerkId);
/**
* 重置 每天的上限好友数量
* 定时任务
*
* @param param 参数
* @author mozhu
* @date 2022-07-07 13:52:28
*/
void resetAddNumAndOverFlag(String param);
/**
* 检查员工开启联系我
* 定时任务
*
* @param param 参数
* @author mozhu
* @date 2022-07-07 14:25:54
*/
void checkStaffOpenContact(String param);
/**
* 检查员工开启联系我
*
* @param wxEnterpriseId wx企业标识
* @param enterpriseId 企业标识
* @author mozhu
* @date 2022-08-08 22:01:43
*/
void checkStaffOpenContactByWxEnterpriseId(String wxEnterpriseId, String enterpriseId);
/**
* 活码门店ids
*
* @param enterpriseId 企业标识
* @return {@link List }<{@link HmQrcodeStoreDTO }>
* @author mozhu
* @date 2022-07-08 15:07:15
*/
List<HmQrcodeStoreDTO> getHmStoreByEnterpriseId(String wxEnterpriseId, String enterpriseId);
/**
* @param enterpriseId
* @return
* @throws
* @Title: getHmStoreForWxa
* @Description: 返回小程序有活码的门店列表
* @author xugh
*/
List<String> getHmStoreForWxa(String wxEnterpriseId, String enterpriseId);
/**
* 批量修改活码分组
*
* @param hmIds
* @param groupId
* @return
*/
ServiceResponse<Boolean> batchUpdateHmQrcodeGroup(List<Long> hmIds, Long groupId);
/**
* @param qdto
* @return
* @throws
* @Title: listHmIdForIndex
* @Description: 返回活码id列表, 用于首页列表查询
* @author xugh
*/
ServiceResponse<List<String>> listHmIdForIndex(HmQrcodeListQDTO qdto);
ServiceResponse<List<String>> listHasQrcodeClerk(String enterpriseId, List<String> clerkIdList);
}
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.WxUserAddLogDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO;
/**
*
* @ClassName: TabHaobanWxUserAddLogMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年07月04日 14:07:32
* @Modify
* @CopyRight
*/
public interface WxUserAddLogApiService {
/**
*
* @Title: page
* @Description: 分页列表查询
* @author xugh
* @param qdto
* @param pageInfo
* @return
* @throws
*/
public ServiceResponse<Page<WxUserAddLogDTO>> page(WxUserAddLogSearchQDTO qdto, BasePageInfo pageInfo);
}
\ No newline at end of file
......@@ -5,6 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
......@@ -117,4 +118,19 @@ public interface WelcomeApiService {
*/
ServiceResponse<Page<WelcomeListDTO>> listWelcomeWithCondition(QueryWelcomeQDTO queryWelcomeQDTO);
/**
* 删除欢迎语,带欢迎语校验
* @param welcomeId
* @return
*/
ServiceResponse<WelcomeRemoveCheckDTO> removeWelcomeWithErrorInfo(String welcomeId);
/**
* 欢迎语被引用统计
* @param welcomeId
* @return
*/
ServiceResponse<WelcomeRemoveCheckDTO> welcomeReferStatistics(String welcomeId);
}
package com.gic.haoban.manage.api.util;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigService;
import com.gic.haoban.manage.api.constants.StatisticsApolloKeyConstant;
import com.gic.haoban.manage.api.dto.statistics.StatisticsDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 描述: DataHttpUtil
*
* @author yujie
* @date 2021/12/29 17:57
*/
public class DataHttpUtil {
private final static Logger logger = LoggerFactory.getLogger(DataHttpUtil.class);
public static StatisticsDTO post(String apolloKey, Object body) {
Config config = ConfigService.getConfig("COMMON.data-api-config");
String value = config.getProperty(apolloKey, "");
if (StringUtils.isBlank(value)) {
throw new RuntimeException("配置有误!");
}
String[] split = value.split(StatisticsApolloKeyConstant.INTERVAL);
String url = split[0];
String token = split[1];
HttpRequest request = HttpUtil.createPost(url);
request.body(JSON.toJSONString(body));
// milliseconds – 超时毫秒数
request.timeout(10000);
request.header("API-TOKEN", token);
logger.info("当前请求: {}", JSON.toJSONString(request, true));
logger.info("当前请求参数: {}", JSON.toJSONString(body, true));
HttpResponse execute = request.execute();
String responseBody = execute.body();
logger.info("当前请求结果 : {}", JSONUtil.formatJsonStr(responseBody));
StatisticsDTO responseBodyDTO = JSON.parseObject(responseBody, StatisticsDTO.class);
if (!execute.isOk() || !responseBodyDTO.getSuccess()) {
logger.error("请求数据组失败:{}", responseBody);
}
return responseBodyDTO;
}
}
\ No newline at end of file
......@@ -6,6 +6,7 @@ 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;
......@@ -17,6 +18,8 @@ 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;
......@@ -45,6 +48,7 @@ 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;
......@@ -392,15 +396,23 @@ public class EnterpriseController extends WebBaseController {
* @param wxEnterpriseId 企业微信id
*/
@RequestMapping("yw-login")
public HaobanResponse ywLogin(String wxEnterpriseId, String gicEnterpriseId, HttpServletResponse httpServletResponse) throws IOException {
public HaobanResponse ywLogin(String wxEnterpriseId, String gicEnterpriseId, HttpServletResponse httpServletResponse,
HttpServletRequest request) throws IOException {
String host = GlobalVar.ctxPropertiesMap.get("haoban_service_host");
logger.info("好办运维login,host={},gicEnterpriseId={},wxEnterpriseId={}", host,gicEnterpriseId,wxEnterpriseId);
if(org.apache.commons.lang3.StringUtils.isAnyBlank(wxEnterpriseId,gicEnterpriseId)) {
return this.fail("wxEnterpriseId和gicEnterpriseId都不能为空") ;
}
AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request) ;
String operationUserId = String.valueOf(loginUser.getId());
//运维信息参数
String operationInfo = "&operationUserId=" + operationUserId + "&userName=" + URLEncoder.encode(loginUser.getRealName(), "UTF-8")
+ "&userMobile=" + loginUser.getUserMobile();
String random = "ywLogin:" + UuidUtil.randomUUID();
RedisUtil.setCache(random, 1, 10L);
String url = host + LOGIN_URL + "?gicEnterpriseId="+gicEnterpriseId+"&wxEnterpriseId=" + wxEnterpriseId + "&random=" + random;
String url = host + LOGIN_URL + "?gicEnterpriseId="+gicEnterpriseId+"&wxEnterpriseId=" + wxEnterpriseId + "&random=" + random
+ operationInfo;
httpServletResponse.sendRedirect(url);
return this.success(null) ;
}
......
......@@ -17,7 +17,6 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@RestController
public class HelpController extends WebBaseController{
private static final String LOGIN_URL = "/haoban-manage3-web/yw-login";
private static Logger logger = LoggerFactory.getLogger(HelpController.class);
@Autowired
......
......@@ -70,7 +70,7 @@ public class TestController extends WebBaseController {
if (null == quartzEnum) {
return resultResponse(HaoBanErrCode.ERR_0);
}
testApiService.quartzTaskConvert(quartzEnum.getServiceName(), quartzEnum.getMethod(), quartzEnum.getCron(), quartzEnum.getParams());
testApiService.quartzTaskConvert(quartzEnum.getServiceName(), quartzEnum.getMethod(), quartzEnum.getCron(), quartzEnum.getParams(), null);
return resultResponse(HaoBanErrCode.ERR_1);
}
......@@ -81,11 +81,11 @@ public class TestController extends WebBaseController {
*/
@RequestMapping("/create-quarter")
@ResponseBody
public HaobanResponse createQuarter(String serviceName, String methodName, String cron, String params) {
public HaobanResponse createQuarter(String serviceName, String methodName, String cron, String params, String referId) {
if (StringUtils.isAnyBlank(serviceName, methodName, cron)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
testApiService.quartzTaskConvert(serviceName, methodName, cron, params);
testApiService.quartzTaskConvert(serviceName, methodName, cron, params, referId);
return resultResponse(HaoBanErrCode.ERR_1);
}
......
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath*:gic-haoban-init.xml" />
<import resource="dubbo-haoban-manage3-operation-web.xml"/>
<import resource="classpath*:dubbo-setting.xml"/>
<import resource="classpath*:redis-init.xml"/>
<import resource="redis-session.xml"/>
</beans>
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath*:gic-haoban-init.xml" />
<import resource="dubbo-haoban-manage3-operation-web.xml"/>
<import resource="classpath*:dubbo-setting.xml"/>
<import resource="classpath*:redis-init.xml"/>
<import resource="redis-session.xml"/>
</beans>
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-4.1.xsd">
<util:constant static-field="org.springframework.session.data.redis.config.ConfigureRedisAction.NO_OP"/>
<bean id="redisHttpSessionConfiguration"
class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration">
<property name="maxInactiveIntervalInSeconds" value="1800"/>
<property name="cookieSerializer" ref="defaultCookieSerializer"/>
</bean>
<bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig">
<property name="maxTotal" value="100"/>
<property name="maxIdle" value="10"/>
</bean>
<bean id="jedisConnectionFactory"
class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" destroy-method="destroy">
<property name="hostName" value="${redis.host}"/>
<property name="port" value="${redis.port}"/>
<property name="password" value="${redis.password}"/>
<property name="timeout" value="3000"/>
<property name="usePool" value="true"/>
<property name="poolConfig" ref="jedisPoolConfig"/>
<property name="database" value="${redis.database}"/>
</bean>
<bean id="defaultCookieSerializer" class="org.springframework.session.web.http.DefaultCookieSerializer">
<property name="cookieName" value="customSessionId"/>
<property name="cookiePath" value="/"></property>
</bean>
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-4.1.xsd">
<util:constant static-field="org.springframework.session.data.redis.config.ConfigureRedisAction.NO_OP"/>
<bean id="redisHttpSessionConfiguration"
class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration">
<property name="maxInactiveIntervalInSeconds" value="1800"/>
<property name="cookieSerializer" ref="defaultCookieSerializer"/>
</bean>
<bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig">
<property name="maxTotal" value="100"/>
<property name="maxIdle" value="10"/>
</bean>
<bean id="jedisConnectionFactory"
class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" destroy-method="destroy">
<property name="hostName" value="${redis.host}"/>
<property name="port" value="${redis.port}"/>
<property name="password" value="${redis.password}"/>
<property name="timeout" value="3000"/>
<property name="usePool" value="true"/>
<property name="poolConfig" ref="jedisPoolConfig"/>
<property name="database" value="${redis.database}"/>
</bean>
<bean id="defaultCookieSerializer" class="org.springframework.session.web.http.DefaultCookieSerializer">
<property name="cookieName" value="customSessionId"/>
<property name="cookiePath" value="/"></property>
</bean>
</beans>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>Archetype Created Web Application</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext-conf.xml</param-value>
</context-param>
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>
<servlet>
<servlet-name>spring</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/spring-*.xml</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
<filter>
<filter-name>encodingFilter</filter-name>
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>utf-8</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>springSessionRepositoryFilter</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
<filter-mapping>
<filter-name>springSessionRepositoryFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
</web-app>
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>Archetype Created Web Application</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext-conf.xml</param-value>
</context-param>
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>
<servlet>
<servlet-name>spring</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/spring-*.xml</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
<filter>
<filter-name>encodingFilter</filter-name>
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>utf-8</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>springSessionRepositoryFilter</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
<filter-mapping>
<filter-name>springSessionRepositoryFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
</web-app>
......@@ -160,6 +160,11 @@
<artifactId>gic-enterprise-operation-api</artifactId>
<version>${gic-enterprise-operation-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>log-record-sdk</artifactId>
<version>${log-record-sdk}</version>
</dependency>
</dependencies>
<build>
......
......@@ -26,6 +26,18 @@ public class Config {
private String historyMbrMassOperWhiteList;
@Value("${qywx_member_suite}")
private String qywxMemberSuite;
@Value("${staff_third_wx_enterpriseId}")
private String staffThirdWxEnterpriseId;
@Value("${hm_link_url}")
private String hmLinkUrl;
public String getHmLinkUrl() {
return hmLinkUrl;
}
public void setHmLinkUrl(String hmLinkUrl) {
this.hmLinkUrl = hmLinkUrl;
}
public String getMemberOpenPage() {
return memberOpenPage;
......@@ -90,4 +102,12 @@ public class Config {
public void setQywxMemberSuite(String qywxMemberSuite) {
this.qywxMemberSuite = qywxMemberSuite;
}
public String getStaffThirdWxEnterpriseId() {
return staffThirdWxEnterpriseId;
}
public void setStaffThirdWxEnterpriseId(String staffThirdWxEnterpriseId) {
this.staffThirdWxEnterpriseId = staffThirdWxEnterpriseId;
}
}
......@@ -172,4 +172,37 @@ public interface StaffMapper {
int updateUserIdByUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("newWxUserId") String newWxUserId,
@Param("oldWxUserId") String oldWxUserId);
/**
* 更新userid by open_userid
*
* @param wxEnterpriseId wx企业标识
* @param wxOpenUseId wx开放使用id
* @param wxUserId wx用户id
* @return int
* @author mozhu
* @date 2022-07-18 19:09:16
*/
int updateWxUserIdsByWxOpenUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("wxOpenUseId") String wxOpenUseId,
@Param("wxUserId") String wxUserId);
/**
* 更新添加num通过id
*
* @param staffId 员工id
* @return int
* @author mozhu
* @date 2022-07-25 16:33:30
*/
int updateAddNumById(@Param("staffId") String staffId);
/**
* 重置添加num
*
* @return int
* @author mozhu
* @date 2022-07-25 16:36:07
*/
int resetAddNum();
}
\ No newline at end of file
......@@ -21,7 +21,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId") String clerkId,
@Param("externalUserId") String externalUserId);
void delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
int delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
void delByUserIdAndExternalUserIdBatch(@Param("wxUserId") String wxUserId,
@Param("wxEnterpriseId") String wxEnterpriseId,
......
......@@ -18,9 +18,9 @@ public interface TabHaobanStaffClerkRelationMapper {
int updateByPrimaryKeySelective(TabHaobanStaffClerkRelation record);
List<TabHaobanStaffClerkRelation> listBindCode(@Param("enterpriseId")String enterpriseId, @Param("clerkCodeList")Set<String> clerkCodeList);
List<TabHaobanStaffClerkRelation> listBindCode(@Param("enterpriseId") String enterpriseId, @Param("clerkCodeList") Set<String> clerkCodeList);
List<TabHaobanStaffClerkRelation> listBindCodeByStaffId(@Param("enterpriseIdList")List<String> enterpriseIdList, @Param("staffId")String staffId);
List<TabHaobanStaffClerkRelation> listBindCodeByStaffId(@Param("enterpriseIdList") List<String> enterpriseIdList, @Param("staffId") String staffId);
TabHaobanStaffClerkRelation getOneByClerkId(@Param("clerkId") String clerkId);
......@@ -35,6 +35,7 @@ public interface TabHaobanStaffClerkRelationMapper {
/**
* 更新信息
*
* @param record
* @return
*/
......@@ -47,13 +48,14 @@ public interface TabHaobanStaffClerkRelationMapper {
* @param wxEnterpriseId
* @return
*/
TabHaobanStaffClerkRelation getBindByClerkId(@Param("clerkId") String clerkId,@Param("wxEnterpriseId") String wxEnterpriseId);
TabHaobanStaffClerkRelation getByCodeAndEnterpriseId(@Param("clerkCode")String clerkCode, @Param("enterpriseId")String enterpriseId);
TabHaobanStaffClerkRelation getBindByClerkId(@Param("clerkId") String clerkId, @Param("wxEnterpriseId") String wxEnterpriseId);
TabHaobanStaffClerkRelation getByCodeAndEnterpriseId(@Param("clerkCode") String clerkCode, @Param("enterpriseId") String enterpriseId);
/**
* 解绑
*/
void delByStoreIdAndCode( @Param("storeId")String storeId,@Param("clerkCode")String clerkCode);
void delByStoreIdAndCode(@Param("storeId") String storeId, @Param("clerkCode") String clerkCode);
/**
......@@ -66,36 +68,36 @@ 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);
List<TabHaobanStaffClerkRelation> listByStoreId(@Param("storeId") String storeId);
TabHaobanStaffClerkRelation getOneByStoreIdAndStaffId(@Param("storeId") String storeId, @Param("staffId") String staffId);
/**
* 解绑
*/
int cleanStaffDepart( @Param("wxEnterpriseId")String wxEnterpriseId,@Param("staffIds")List<String> staffIds);
int cleanStaffDepart(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
TabHaobanStaffClerkRelation getOneBindCodeNoStatus(@Param("enterpriseId") String enterpriseId, @Param("clerkCode") String clerkCode);
TabHaobanStaffClerkRelation getOneBindStoreId(@Param("staffId") String staffId, @Param("storeId") String storeId);
TabHaobanStaffClerkRelation getOneBindCodeNoStatus(@Param("enterpriseId")String enterpriseId, @Param("clerkCode")String clerkCode);
TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId") String clerkId);
TabHaobanStaffClerkRelation getOneBindStoreId(@Param("staffId")String staffId, @Param("storeId")String storeId);
TabHaobanStaffClerkRelation getByClerkIdNoStatus(@Param("clerkId") String clerkId);
TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId")String clerkId);
int delByPrimaryKey(@Param("staffClerkRelationId") String staffClerkRelationId);
TabHaobanStaffClerkRelation getByClerkIdNoStatus(@Param("clerkId")String clerkId);
void delByClerkId(@Param("clerkId") String clerkId);
int delByPrimaryKey(@Param("staffClerkRelationId")String staffClerkRelationId);
void delByClerkId(@Param("clerkId")String clerkId);
List<TabHaobanStaffClerkRelation>listByEnterpriseIdAndWxUserId(@Param("enterpriseId")String enterpriseId,@Param("wxUserId")String wxUserId);
List<TabHaobanStaffClerkRelation> listByEnterpriseIdAndWxUserId(@Param("enterpriseId") String enterpriseId, @Param("wxUserId") String wxUserId);
List<TabHaobanStaffClerkRelation> lisByStaffId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffId")String staffId , @Param("storeIdList") List<String> storeIdList);
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);
TabHaobanStaffClerkRelation getByCodeAndStoreId(@Param("clerkCode") String clerkCode, @Param("storeId") String storeId);
List<TabHaobanStaffClerkRelation> pageByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaffClerkRelation> pageByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaffClerkRelation> listBindByStoreId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId") String storeId);
......@@ -145,8 +147,8 @@ public interface TabHaobanStaffClerkRelationMapper {
* 查询有关联的员工id列表
*
* @param staffIdList 员工id列表
* @author: YongEn
* @return {@link List<String>}
* @author: YongEn
*/
List<String> listRelationsStaffId(@Param("staffIdList") Set<String> staffIdList);
......@@ -154,7 +156,7 @@ public interface TabHaobanStaffClerkRelationMapper {
* 批量查询会员与导购关系并且返回关联信息
*
* @param memberIdList 会员id列表
* @param clerkIdList 导购id列表
* @param clerkIdList 导购id列表
* @param enterpriseId 企业id
* @return {@link MemberStaffRelExtDO}
*/
......@@ -188,4 +190,81 @@ public interface TabHaobanStaffClerkRelationMapper {
* @date 2022-06-30 16:21:31
*/
int updateUserIdByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 根据导购查询wxuserid
*
* @param clerkIds 职员id
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link String }>
* @author mozhu
* @date 2022-07-07 15:26:34
*/
List<String> listWxUserIdByClerkIds(@Param("clerkIds") List<String> clerkIds,
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 根据导购查询wxopenuserid
*
* @param clerkIds 职员id
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link String }>
* @author mozhu
* @date 2022-08-09 00:42:31
*/
List<String> listWxOpenUserIdByClerkIds(@Param("clerkIds") List<String> clerkIds,
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 通过userId 查询id
*
* @param wxOpenUserIds wx开放用户id
* @param wxEnterpriseId wx企业标识
* @param enterpriseId 企业标识
* @return {@link List }<{@link StaffClerkRelationDTO }>
* @author mozhu
* @date 2022-08-08 21:51:22
*/
List<StaffClerkRelationDTO> listIdsByWxOpenUserIds(@Param("wxOpenUserIds") List<String> wxOpenUserIds,
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId);
/**
* 更新联系我状态
*
* @param openConcatFlag 打开concat国旗
* @param staffClerkRelationId 员工职员关系id
* @return int
* @author mozhu
* @date 2022-07-07 15:32:23
*/
int updateOpenConcatFlagById(@Param("openConcatFlag") Integer openConcatFlag, @Param("staffClerkRelationId") String staffClerkRelationId);
/**
* 通过userid 不在范围内 查询id
*
* @param wxOpenUserIds wx开放用户id
* @param wxEnterpriseId wx企业标识
* @param enterpriseId 企业标识
* @return {@link List }<{@link StaffClerkRelationDTO }>
* @author mozhu
* @date 2022-08-08 22:02:18
*/
List<StaffClerkRelationDTO> listIdsByNotInWxOpenUserIds(@Param("wxOpenUserIds") List<String> wxOpenUserIds,
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId);
/**
* 通过职员id 查询职员id列表
*
* @param clerkIds 职员id
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link String }>
* @author mozhu
* @date 2022-07-07 16:30:32
*/
List<StaffClerkRelationDTO> listClerkIdConcatFlagByClerkIds(@Param("clerkIds") List<String> clerkIds,
@Param("wxEnterpriseId") String wxEnterpriseId);
}
\ No newline at end of file
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