Skip to content

H
haoban-manage3.0
Commit d917ca0c by 王祖波
Options

Merge branch 'developer' into 'feature-recommend' 

# Conflicts:
#   haoban-manage3-service/src/main/resources/mapper/content/TabHaobanInteractRecordMapper.xml
parents d6116658 0b1d08eb
Showing with 3841 additions and 501 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MaterialCategoryDTO.java
......@@ -19,8 +19,18 @@ public class MaterialCategoryDTO implements Serializable{
private Date updateTime;
private Integer sortNum;
private static final long serialVersionUID = 1L;
public Integer getSortNum() {
return sortNum;
}
public void setSortNum(Integer sortNum) {
this.sortNum = sortNum;
}
public String getCategoryId() {
return categoryId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java
......@@ -14,7 +14,11 @@ public class WxEnterpriseQwDTO implements Serializable {
private String memberCorpid;
// 第三方
private String thirdCorpid;
// 好办小程序应用id
private String agentId;
// 好办小程序名称
private String agentName;
private String selfSecret ;
// 自建请求地址
private String urlHost ;
......@@ -65,11 +69,6 @@ public class WxEnterpriseQwDTO implements Serializable {
this.selfSecret = selfSecret;
}
// 好办小程序应用id
private String agentId;
// 好办小程序名称
private String agentName;
// 第三方使用的加密的userid
public boolean needOpenUserId3th() {
......@@ -81,7 +80,7 @@ public class WxEnterpriseQwDTO implements Serializable {
}
public boolean isSelf() {
return this.wxSecurityType == 5 ;
return this.wxSecurityType == 5 || this.wxSecurityType == 6;
}
public int getWxSecurityType() {
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/ChatEventDTO.java
......@@ -18,6 +18,17 @@ public class ChatEventDTO implements Serializable {
private String corpid;
// 是否自建应用的回调
private int selfCallback = 0 ;
// 用于判断是否代开发应用的回调
private String suiteId;
public String getSuiteId() {
return suiteId;
}
public void setSuiteId(String suiteId) {
this.suiteId = suiteId;
}
public int getSelfCallback() {
return selfCallback;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/content/MaterialConvertDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.content;
import java.io.Serializable;
import java.util.List;
/**
* @Author MUSI
* @Date 2023/4/26 1:57 PM
* @Description
* @Version
**/
public class MaterialConvertDTO implements Serializable {
private String enterpriseId;
private String wxEnterpriseId;
private String qrCodeUrl;
private List<String> imageUrls;
// 素材类型, 1文本, 2图片, 3网页, 4视频, 5文件,6小程序
private int materialType;
// 1群发 2朋友圈
private int mediaType ;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getQrCodeUrl() {
return qrCodeUrl;
}
public void setQrCodeUrl(String qrCodeUrl) {
this.qrCodeUrl = qrCodeUrl;
}
public List<String> getImageUrls() {
return imageUrls;
}
public void setImageUrls(List<String> imageUrls) {
this.imageUrls = imageUrls;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public int getMaterialType() {
return materialType;
}
public void setMaterialType(int materialType) {
this.materialType = materialType;
}
public int getMediaType() {
return mediaType;
}
public void setMediaType(int mediaType) {
this.mediaType = mediaType;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java
......@@ -34,7 +34,20 @@ public class HmLinkWxaDTO implements Serializable {
private List<HmLinkStoreDTO> storeList;
// 说明
private Map<String,String> remarkMap ;
/**
* 是否企微好友
*/
private Integer qwFriendFlag ;
public Integer getQwFriendFlag() {
return qwFriendFlag;
}
public void setQwFriendFlag(Integer qwFriendFlag) {
this.qwFriendFlag = qwFriendFlag;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderProgressDTO.java
package com.gic.haoban.manage.api.dto.licence;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public class LicenceOrderProgressDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
/**
* 订单状态
*/
private String orderStatus;
/**
* 标记字段 1好办后台
*/
private Integer type;
/**
* 上传凭证url
*/
private String voucher;
/**
* 原因
*/
private String reason;
/**
* 创建时间
*/
private Date createTime;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(String orderStatus) {
this.orderStatus = orderStatus;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getVoucher() {
return voucher;
}
public void setVoucher(String voucher) {
this.voucher = voucher;
}
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
package com.gic.haoban.manage.api.dto.licence;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public class LicenceOrderProgressDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
/**
* 订单状态
*/
private String orderStatus;
/**
* 标记字段 1好办后台
*/
private Integer type;
/**
* 上传凭证url
*/
private String voucher;
/**
* 原因
*/
private String reason;
/**
* 创建时间
*/
private Date createTime;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(String orderStatus) {
this.orderStatus = orderStatus;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getVoucher() {
return voucher;
}
public void setVoucher(String voucher) {
this.voucher = voucher;
}
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/moment/QwMomentPlanAttendDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.moment;
import java.io.Serializable ;
import java.util.Date;
public class QwMomentPlanAttendDTO implements Serializable{
private static final long serialVersionUID = 85681326319600L;
/**id*/
private Long attendId;
/**计划id*/
private Long planId;
/**企微企业id*/
private String wxEnterpriseId;
/**企业id*/
private String enterpriseId;
/**staff*/
private String staffId;
private String staffName;
/**导购*/
private String clerkId;
/**导购code*/
private String clerkCode;
/**导购名称*/
private String clerkName;
/**创建时间*/
private java.util.Date createTime;
/**更新时间*/
private java.util.Date updateTime;
/**是否删除*/
private Integer deleteFlag;
/**评论数*/
private Integer commentCount;
/**点赞数*/
private Integer likeCount;
/**1待执行 2已执行*/
private Integer taskStatus;
/**任务执行时间*/
private java.util.Date sendTime;
/**企微朋友圈id*/
private String momentId;
/**企微获取数据时间*/
private java.util.Date qwDataTime;
/**门店id*/
private String storeId;
// 0待下发 1已下发
private Integer statusFlag ;
private String reason ;
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Long getAttendId() {
return attendId;
}
public void setAttendId(Long attendId) {
this.attendId = attendId;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
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 getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
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;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Integer getCommentCount() {
return commentCount;
}
public void setCommentCount(Integer commentCount) {
this.commentCount = commentCount;
}
public Integer getLikeCount() {
return likeCount;
}
public void setLikeCount(Integer likeCount) {
this.likeCount = likeCount;
}
public Integer getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(Integer taskStatus) {
this.taskStatus = taskStatus;
}
public Date getSendTime() {
return sendTime;
}
public void setSendTime(Date sendTime) {
this.sendTime = sendTime;
}
public String getMomentId() {
return momentId;
}
public void setMomentId(String momentId) {
this.momentId = momentId;
}
public Date getQwDataTime() {
return qwDataTime;
}
public void setQwDataTime(Date qwDataTime) {
this.qwDataTime = qwDataTime;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/moment/QwMomentPlanDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.moment;
import java.io.Serializable ;
import java.util.Date;
import java.util.List;
public class QwMomentPlanDTO implements Serializable{
private static final long serialVersionUID = 85646353131100L;
/**活动id*/
private Long planId;
/**名称*/
private String title;
/**描述*/
private String remark;
/**开始日期*/
private java.util.Date beginDate;
/**结束日期*/
private java.util.Date endDate;
/**几天后失效*/
private Integer expireDays;
/**执行方式 0企微1好办小程序*/
private Integer execType;
/**企微id*/
private String wxEnterpriseId;
/**企业id*/
private String enterpriseId;
/**创建人*/
private String creatorId;
/**创建人*/
private String creatorName;
/**1有效 2终止*/
private Integer statusFlag;
/**1删0有效*/
private Integer deleteFlag;
/**1立即发布2定时发布*/
private Integer publishType;
/**发布时间*/
private java.util.Date publishTime;
/**0全部导购 1部分导购*/
private Integer planClerkType;
/**总任务数*/
private Integer totalNum;
private Integer taskClerkNum ;
/**执行任务数*/
private Integer doneNum;
/**终止时间*/
private java.util.Date stopTime;
/**0自主上传 1内容*/
private Integer mediaType;
/**素材json*/
private String mediaInfo;
/**素材回显内容*/
private String mediaInfoShow;
/**创建时间*/
private java.util.Date createTime;
/**更新时间*/
private java.util.Date updateTime;
/**总点赞数*/
private Integer totalLikeCount;
/**总评论数*/
private Integer totalCommentCount;
/**企微jobid*/
private String qwJobid;
/**完成率*/
private Integer execRate;
// 选择的导购id列表
private List<String> selectClerkIdList ;
/**
* 链接开关
*/
private Integer mediaLinkFlag ;
/**
* 参与导购列表
*/
private List<QwMomentPlanAttendDTO> clerkList ;
public Integer getMediaLinkFlag() {
return mediaLinkFlag;
}
public void setMediaLinkFlag(Integer mediaLinkFlag) {
this.mediaLinkFlag = mediaLinkFlag;
}
public List<QwMomentPlanAttendDTO> getClerkList() {
return clerkList;
}
public void setClerkList(List<QwMomentPlanAttendDTO> clerkList) {
this.clerkList = clerkList;
}
public Integer getTaskClerkNum() {
return taskClerkNum;
}
public void setTaskClerkNum(Integer taskClerkNum) {
this.taskClerkNum = taskClerkNum;
}
public List<String> getSelectClerkIdList() {
return selectClerkIdList;
}
public void setSelectClerkIdList(List<String> selectClerkIdList) {
this.selectClerkIdList = selectClerkIdList;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Date getBeginDate() {
return beginDate;
}
public void setBeginDate(Date beginDate) {
this.beginDate = beginDate;
}
public Date getEndDate() {
return endDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public Integer getExpireDays() {
return expireDays;
}
public void setExpireDays(Integer expireDays) {
this.expireDays = expireDays;
}
public Integer getExecType() {
return execType;
}
public void setExecType(Integer execType) {
this.execType = execType;
}
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 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 Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Integer getPublishType() {
return publishType;
}
public void setPublishType(Integer publishType) {
this.publishType = publishType;
}
public Date getPublishTime() {
return publishTime;
}
public void setPublishTime(Date publishTime) {
this.publishTime = publishTime;
}
public Integer getPlanClerkType() {
return planClerkType;
}
public void setPlanClerkType(Integer planClerkType) {
this.planClerkType = planClerkType;
}
public Integer getTotalNum() {
return totalNum;
}
public void setTotalNum(Integer totalNum) {
this.totalNum = totalNum;
}
public Integer getDoneNum() {
return doneNum;
}
public void setDoneNum(Integer doneNum) {
this.doneNum = doneNum;
}
public Date getStopTime() {
return stopTime;
}
public void setStopTime(Date stopTime) {
this.stopTime = stopTime;
}
public Integer getMediaType() {
return mediaType;
}
public void setMediaType(Integer mediaType) {
this.mediaType = mediaType;
}
public String getMediaInfo() {
return mediaInfo;
}
public void setMediaInfo(String mediaInfo) {
this.mediaInfo = mediaInfo;
}
public String getMediaInfoShow() {
return mediaInfoShow;
}
public void setMediaInfoShow(String mediaInfoShow) {
this.mediaInfoShow = mediaInfoShow;
}
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 getTotalLikeCount() {
return totalLikeCount;
}
public void setTotalLikeCount(Integer totalLikeCount) {
this.totalLikeCount = totalLikeCount;
}
public Integer getTotalCommentCount() {
return totalCommentCount;
}
public void setTotalCommentCount(Integer totalCommentCount) {
this.totalCommentCount = totalCommentCount;
}
public String getQwJobid() {
return qwJobid;
}
public void setQwJobid(String qwJobid) {
this.qwJobid = qwJobid;
}
public Integer getExecRate() {
return execRate;
}
public void setExecRate(Integer execRate) {
this.execRate = execRate;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/moment/QwMomentPlanDataDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.moment;
import java.io.Serializable ;
import java.util.Date;
public class QwMomentPlanDataDTO implements Serializable{
private static final long serialVersionUID = 69664410786500L;
/**id*/
private Long dataId;
/**计划id*/
private Long planId;
/**企微企业id*/
private String wxEnterpriseId;
/**企业id*/
private String enterpriseId;
/**staff*/
private String staffId;
private String staffName ;
/**导购*/
private String clerkId;
/**门店id*/
private String storeId;
/**客户id*/
private String memberId;
/**创建时间*/
private java.util.Date createTime;
/**更新时间*/
private java.util.Date updateTime;
/**是否删除*/
private Integer deleteFlag;
/**评论时间*/
private java.util.Date commentTime;
/**点赞时间*/
private java.util.Date likeTime;
/**是否评论*/
private Integer commentFlag;
/**是否点赞*/
private Integer likeFlag;
private String clerkCode ;
private String clerkName ;
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public Long getDataId() {
return dataId;
}
public void setDataId(Long dataId) {
this.dataId = dataId;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
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 getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
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 getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Date getCommentTime() {
return commentTime;
}
public void setCommentTime(Date commentTime) {
this.commentTime = commentTime;
}
public Date getLikeTime() {
return likeTime;
}
public void setLikeTime(Date likeTime) {
this.likeTime = likeTime;
}
public Integer getCommentFlag() {
return commentFlag;
}
public void setCommentFlag(Integer commentFlag) {
this.commentFlag = commentFlag;
}
public Integer getLikeFlag() {
return likeFlag;
}
public void setLikeFlag(Integer likeFlag) {
this.likeFlag = likeFlag;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/moment/QwMomentPlanWxaDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.moment;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
public class QwMomentPlanWxaDTO implements Serializable {
private Long planId ;
/**
* 计划名称
*/
private String name ;
/**
* 任务总数
*/
private int totalNum ;
/**
* 已完成
*/
private int execNum ;
/**
* 未完成
*/
private int notExecNum ;
/**
* 开始时间
*/
private Date startTime ;
/**
* 结束时间
*/
private Date endTime ;
/**
* 点赞数
*/
private int likeCount ;
/**
* 评论数
*/
private int commentCount ;
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getTotalNum() {
return totalNum;
}
public void setTotalNum(int totalNum) {
this.totalNum = totalNum;
}
public int getExecNum() {
return execNum;
}
public void setExecNum(int execNum) {
this.execNum = execNum;
}
public int getNotExecNum() {
return notExecNum;
}
public void setNotExecNum(int notExecNum) {
this.notExecNum = notExecNum;
}
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 int getLikeCount() {
return likeCount;
}
public void setLikeCount(int likeCount) {
this.likeCount = likeCount;
}
public int getCommentCount() {
return commentCount;
}
public void setCommentCount(int commentCount) {
this.commentCount = commentCount;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/moment/TaskDetailDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.moment;
import java.io.Serializable;
import java.util.Date;
public class TaskDetailDTO implements Serializable {
private Long planId ;
private Long attendId ;
private String clerkId ;
/**
* 执行导购名称
*/
private String clerkName ;
/**
* 任务名称
*/
private String name ;
/**
* 任务描述
*/
private String remark ;
/**
* 开始时间
*/
private Date startTime ;
/**
* 结束时间
*/
private Date endTime ;
/**
* 点赞数
*/
private int likeCount ;
/**
* 评论数
*/
private int commentCount ;
/**任务执行完成时间*/
private Date sendTime ;
/**
* 执行方式 0企微1好办小程序
*/
private int execType ;
/**
* 数据更新时间
*/
private Date qwDataTime ;
// 0已失效1待执行 2已执行
private Integer taskStatus ;
// 1内容
private Integer mediaType ;
public Integer getMediaType() {
return mediaType;
}
public void setMediaType(Integer mediaType) {
this.mediaType = mediaType;
}
public Long getAttendId() {
return attendId;
}
public void setAttendId(Long attendId) {
this.attendId = attendId;
}
public Integer getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(Integer taskStatus) {
this.taskStatus = taskStatus;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
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 getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
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 int getLikeCount() {
return likeCount;
}
public void setLikeCount(int likeCount) {
this.likeCount = likeCount;
}
public int getCommentCount() {
return commentCount;
}
public void setCommentCount(int commentCount) {
this.commentCount = commentCount;
}
public Date getSendTime() {
return sendTime;
}
public void setSendTime(Date sendTime) {
this.sendTime = sendTime;
}
public int getExecType() {
return execType;
}
public void setExecType(int execType) {
this.execType = execType;
}
public Date getQwDataTime() {
return qwDataTime;
}
public void setQwDataTime(Date qwDataTime) {
this.qwDataTime = qwDataTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/moment/TaskListWxaDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.moment;
import java.io.Serializable;
import java.util.Date;
public class TaskListWxaDTO implements Serializable {
private Long planId ;
/**
* 计划名称
*/
private String name ;
/**
* 任务总数
*/
private int totalNum ;
/**
* 已完成
*/
private int execNum ;
/**
* 未完成
*/
private int notExecNum ;
/**
* 开始时间
*/
private Date startTime ;
/**
* 结束时间
*/
private Date endTime ;
/**
* 点赞数
*/
private int likeCount ;
/**
* 评论数
*/
private int commentCount ;
// 0已失效1待执行 2已执行
private Integer taskStatus ;
private String clerkName ;
private String clerkId ;
private Date sendTime ;
public Date getSendTime() {
return sendTime;
}
public void setSendTime(Date sendTime) {
this.sendTime = sendTime;
}
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 Integer getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(Integer taskStatus) {
this.taskStatus = taskStatus;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getTotalNum() {
return totalNum;
}
public void setTotalNum(int totalNum) {
this.totalNum = totalNum;
}
public int getExecNum() {
return execNum;
}
public void setExecNum(int execNum) {
this.execNum = execNum;
}
public int getNotExecNum() {
return notExecNum;
}
public void setNotExecNum(int notExecNum) {
this.notExecNum = notExecNum;
}
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 int getLikeCount() {
return likeCount;
}
public void setLikeCount(int likeCount) {
this.likeCount = likeCount;
}
public int getCommentCount() {
return commentCount;
}
public void setCommentCount(int commentCount) {
this.commentCount = commentCount;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/MaterialCategorySortQDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.qdto;
import java.io.Serializable;
public class MaterialCategorySortQDTO implements Serializable {
private String categoryId;
private String wxEnterpriseId;
private Integer sortNum ;
public String getCategoryId() {
return categoryId;
}
public void setCategoryId(String categoryId) {
this.categoryId = categoryId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getSortNum() {
return sortNum;
}
public void setSortNum(Integer sortNum) {
this.sortNum = sortNum;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatPlanSearchQDTO.java
......@@ -13,6 +13,7 @@ public class GroupChatPlanSearchQDTO implements Serializable {
private String wxEnterpriseId;
private String enterpriseId;
private String searchParams;
private String searchParamsLike ;
// 1进行中、2未开始、3已结束
private Integer status;
// 群主 0发送失败 1待发送 2已发送 3放弃 30(失败+放弃)
......@@ -31,6 +32,14 @@ public class GroupChatPlanSearchQDTO implements Serializable {
// clerkTaskStatus 1待处理 2已处理/已失效
private int clerkTaskStatus ;
public String getSearchParamsLike() {
return searchParamsLike;
}
public void setSearchParamsLike(String searchParamsLike) {
this.searchParamsLike = searchParamsLike;
}
public int getClerkTaskStatus() {
return clerkTaskStatus;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatUserSearchQDTO.java
package com.gic.haoban.manage.api.dto.qdto.chat;
import com.alibaba.fastjson.annotation.JSONField;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
......@@ -22,6 +24,11 @@ public class GroupChatUserSearchQDTO implements Serializable {
private Integer status = 1;
private String wxChatId ;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
public List<String> getStaffIdList() {
return staffIdList;
}
......@@ -30,6 +37,14 @@ public class GroupChatUserSearchQDTO implements Serializable {
this.staffIdList = staffIdList;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public String getWxChatId() {
return wxChatId;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java
......@@ -40,7 +40,8 @@ public enum NoticeMessageTypeEnum {
TEL_TASK_CANVAS(2017, "话务任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTelTaskCanvas", "/pages/route/index?pageType=", "hbapp_canvas_task", "haobanTelTaskCanvas", "haobanNotice"),
HB_TASK_TO_DO_LIST_NOTICE(2018, "任务执行提醒", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTaskTodoNotice", "/pages/route/index?pageType=", "", "haobanTaskTodoNotice", "haobanNotice"),
hbapp_canvas_friend_circle_task(2019, "朋友圈活动-任务详情", NoticeMessageCategoryTypeEnum.TASK.getType(), "qwMomentPlanDetail", "/pages/route/index?pageType=", "hbapp_canvas_friend_circle_task", "qwMomentPlanDetail", "haobanNotice"),
hbapp_canvas_friend_circle_list(2020, "朋友圈-活动列表", NoticeMessageCategoryTypeEnum.TASK.getType(), "qwMomentPlanList", "/pages/route/index?pageType=", "hbapp_canvas_friend_circle_list", "qwMomentPlanList", "haobanNotice"),
STORE_ACCOUNT(3001, "账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "store_account", "/pages/route/index?pageType=", "store_relate_store_record_list", "accountApplication", "haobanNotice"),
//
......@@ -108,8 +109,14 @@ public enum NoticeMessageTypeEnum {
AUTHORIZED_LOGIN_NOTIFY(8001,"账号授权通知", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"authorized_login_notify","/pages/route/index?pageType=","hbapp_video_auth","authorizedLoginNotify","haobanNotice"),
AUTHORIZED_LOGOUT_NOTIFY(8002,"账号异常退出登录通知", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"authorized_logout_notify","/pages/route/index?pageType=","hbapp_video_auth","authorizedLogoutNotify","haobanNotice"),
DATA_EXPORT_NOTIFY(9001,"数据导出通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"data_export_notify","/pages/route/index?pageType=","hbapp_data_export","dataExportNotify","haobanNotice");
DATA_EXPORT_NOTIFY(9001,"数据导出通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"data_export_notify","/pages/route/index?pageType=","hbapp_data_export","dataExportNotify","haobanNotice"),
OBJECTIVES_CREATE(9002, "目标设置通知", NoticeMessageCategoryTypeEnum.OTHER.getType(), "objectivesCreate", "/pages/route/index?pageType=", "hbapp_task_kpi_detail", "objectivesCreate", "haobanNotice"),
OBJECTIVES_CHANGE(9003, "目标设置通知", NoticeMessageCategoryTypeEnum.OTHER.getType(), "objectivesChange", "/pages/route/index?pageType=", "hbapp_task_kpi_detail", "objectivesChange", "haobanNotice"),
OBJECTIVES_CLERK_CREATE(9004, "目标设置通知", NoticeMessageCategoryTypeEnum.OTHER.getType(), "objectivesClerkCreate", "/pages/route/index?pageType=", "objectives_clerk_create", "objectivesClerkCreate", "haobanNotice"),
OBJECTIVES_CLERK_CHANGE(9005, "目标设置通知", NoticeMessageCategoryTypeEnum.OTHER.getType(), "objectivesClerkChange", "/pages/route/index?pageType=", "objectives_clerk_change", "objectivesClerkChange", "haobanNotice"),
;
/**
* 消息类型
*/
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/PendingTaskTypeEnum.java
......@@ -11,6 +11,7 @@ public enum PendingTaskTypeEnum {
GROUP_TASK(3, "客户群发", "您收到了新的企微群发任务【{}】，赶紧到企业微信-消息-群发助手中执行吧~"),
ACTIVITY(4, "活动", "您报名的{}活动已经开始啦，快去转发赚佣金吧~"),
GROUP_CHAT(5, "社群群发", "您收到了新的社群群发任务【{}】，赶紧到企业微信-消息-群发助手中执行吧~"),
QYWX_MOMENT(6, "企微朋友圈", "您收到了新的企微朋友圈发布任务【{}】，快去执行吧~"),
;
private int type;
private String name;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/moment/PlanClerkListQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.moment;
import com.gic.api.base.commons.BasePageInfo;
import java.util.Date;
public class PlanClerkListQDTO extends BasePageInfo {
private String wxEnterpriseId ;
private String enterpriseId ;
private Long planId ;
/**
* 成员名称
*/
private String staffName ;
private String staffNameLike ;
/**
* 导购条件
*/
private String clerkParams ;
private String clerkParamsLike ;
/**
* 0已失效 1待完成 2已完成
*/
private Integer sendStatus ;
private Date startTime ;
private Date endTime ;
/**
* 排序字段 完成率:exec_rate 点赞：like_count 评论：comment_count
*/
private String sortColumn ;
/**
* desc / asc
*/
private String sortType ;
private Integer statusFlag ;
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public String getStaffNameLike() {
return staffNameLike;
}
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 void setStaffNameLike(String staffNameLike) {
this.staffNameLike = staffNameLike;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public String getClerkParamsLike() {
return clerkParamsLike;
}
public void setClerkParamsLike(String clerkParamsLike) {
this.clerkParamsLike = clerkParamsLike;
}
public String getSortColumn() {
return sortColumn;
}
public void setSortColumn(String sortColumn) {
this.sortColumn = sortColumn;
}
public String getSortType() {
return sortType;
}
public void setSortType(String sortType) {
this.sortType = sortType;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public String getClerkParams() {
return clerkParams;
}
public void setClerkParams(String clerkParams) {
this.clerkParams = clerkParams;
}
public Integer getSendStatus() {
return sendStatus;
}
public void setSendStatus(Integer sendStatus) {
this.sendStatus = sendStatus;
}
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;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/moment/PlanDataListQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.moment;
import com.gic.api.base.commons.BasePageInfo;
import java.util.Date;
public class PlanDataListQDTO extends BasePageInfo {
private String wxEnterpriseId ;
private String enterpriseId ;
private Long planId ;
/**
* 成员名称
*/
private String staffName ;
private String staffNameLike ;
/**
* 导购条件
*/
private String clerkParams ;
private String clerkParamsLike ;
/**
* 1点赞 2评论
*/
private Integer type ;
private Date startTime ;
private Date endTime ;
/**
* 排序字段 完成率:exec_rate 点赞：total_like_count 评论：total_comment_count
*/
private String sortColumn ;
/**
* desc / asc
*/
private String sortType ;
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 Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public String getStaffNameLike() {
return staffNameLike;
}
public void setStaffNameLike(String staffNameLike) {
this.staffNameLike = staffNameLike;
}
public String getSortColumn() {
return sortColumn;
}
public void setSortColumn(String sortColumn) {
this.sortColumn = sortColumn;
}
public String getSortType() {
return sortType;
}
public void setSortType(String sortType) {
this.sortType = sortType;
}
public String getClerkParamsLike() {
return clerkParamsLike;
}
public void setClerkParamsLike(String clerkParamsLike) {
this.clerkParamsLike = clerkParamsLike;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public String getClerkParams() {
return clerkParams;
}
public void setClerkParams(String clerkParams) {
this.clerkParams = clerkParams;
}
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;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/moment/PlanListWxaQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.moment;
import com.gic.api.base.commons.BasePageInfo;
import java.io.Serializable;
public class PlanListWxaQDTO extends BasePageInfo {
private String wxEnterpriseId ;
private String enterpriseId ;
private String storeId ;
private String staffId ;
private String clerkId ;
/**
* 0未完成 1已完成或已失效
*/
private Integer planStatus ;
/**
* 活动名称
*/
private String name ;
private String nameLike ;
public String getNameLike() {
return nameLike;
}
public void setNameLike(String nameLike) {
this.nameLike = nameLike;
}
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 getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public Integer getPlanStatus() {
return planStatus;
}
public void setPlanStatus(Integer planStatus) {
this.planStatus = planStatus;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/moment/QwMomentPlanQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.moment;
import com.gic.api.base.commons.BasePageInfo;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
*
* @ClassName: TabHaobanQwMomentPlan
* @Description: TODO
* @Author 徐高华
* @Date 2025年03月05日 10:27:20
* @Modify
* @CopyRight 杭州
*/
public class QwMomentPlanQDTO extends BasePageInfo {
private String wxEnterpriseId ;
private String enterpriseId ;
/**
* 活动名称或id
*/
private String nameParams ;
private String nameParamsLike ;
/**
* 执行方式
*/
private Integer execType ;
/**
* 1进行中 2终止 0未开始 3 已结束
*/
private Integer statusFlag ;
/**
* 开始时间
*/
private Date startTime ;
/**
* 结束时间
*/
private Date endTime ;
/**
* 创建人
*/
private List<String> creatorIdList ;
/**
* 排序字段 完成率:exec_rate 点赞：total_like_count 评论：total_comment_count
*/
private String sortColumn ;
/**
* desc / asc
*/
private String sortType ;
public List<String> getCreatorIdList() {
return creatorIdList;
}
public void setCreatorIdList(List<String> creatorIdList) {
this.creatorIdList = creatorIdList;
}
public String getNameParamsLike() {
return nameParamsLike;
}
public void setNameParamsLike(String nameParamsLike) {
this.nameParamsLike = nameParamsLike;
}
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 getSortColumn() {
return sortColumn;
}
public void setSortColumn(String sortColumn) {
this.sortColumn = sortColumn;
}
public String getSortType() {
return sortType;
}
public void setSortType(String sortType) {
this.sortType = sortType;
}
public String getNameParams() {
return nameParams;
}
public void setNameParams(String nameParams) {
this.nameParams = nameParams;
}
public Integer getExecType() {
return execType;
}
public void setExecType(Integer execType) {
this.execType = execType;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
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;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/moment/SendResultQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.moment;
import java.io.Serializable;
import java.util.Date;
public class SendResultQDTO implements Serializable {
private String wxEnterpriseId ;
private String staffId ;
private String clerkId ;
private Long planId ;
/**
* 发送时间
*/
private Date sendTime ;
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public Date getSendTime() {
return sendTime;
}
public void setSendTime(Date sendTime) {
this.sendTime = sendTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/moment/TaskListWxaQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.moment;
import com.gic.api.base.commons.BasePageInfo;
import java.io.Serializable;
public class TaskListWxaQDTO extends BasePageInfo {
private String wxEnterpriseId ;
private String enterpriseId ;
private String storeId ;
private String staffId ;
private String clerkId ;
/**
* 指定查询的导购ID
*/
private String execClerkId ;
/**
* 0已失效 1未完成 2已完成
*/
private Integer taskStatus ;
private Long planId ;
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 getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getExecClerkId() {
return execClerkId;
}
public void setExecClerkId(String execClerkId) {
this.execClerkId = execClerkId;
}
public Integer getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(Integer taskStatus) {
this.taskStatus = taskStatus;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/moment/TaskNumQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.moment;
import java.io.Serializable;
public class TaskNumQDTO implements Serializable {
private String wxEnterpriseId ;
private String enterpriseId ;
private String storeId ;
private String clerkId ;
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 getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanCommonMQApiService.java
......@@ -42,4 +42,5 @@ public interface HaobanCommonMQApiService {
// 服务开通事件
public void serviceOpenOffEvent(String params) ;
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MaterialApiService.java
......@@ -7,6 +7,7 @@ import com.gic.haoban.manage.api.dto.BatchAddMaterialDTO;
import com.gic.haoban.manage.api.dto.ContentMaterialDTO;
import com.gic.haoban.manage.api.dto.MaterialCategoryDTO;
import com.gic.haoban.manage.api.dto.MaterialDTO;
import com.gic.haoban.manage.api.dto.qdto.MaterialCategorySortQDTO;
import com.gic.haoban.manage.api.qdto.combined.CombinedQDTO;
import java.util.List;
......@@ -41,7 +42,7 @@ public interface MaterialApiService {
String reUpdalodMetail(String materialId);
List<MaterialCategoryDTO> listByParentCategory(String categoryId);
List<MaterialCategoryDTO> listByParentCategory(String wxEnterpriseId ,String categoryId);
/**
* 分析素材
......@@ -88,4 +89,9 @@ public interface MaterialApiService {
com.gic.api.base.commons.ServiceResponse<String> getMaterialIdByCombined(String wxEnterpriseId, CombinedQDTO combinedQDTO);
/**
* 排序
* @param qdto
*/
void materialSortCategory(MaterialCategorySortQDTO qdto);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/content/MaterialShareLogApiService.java
package com.gic.haoban.manage.api.service.content;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.content.MaterialConvertDTO;
import com.gic.haoban.manage.api.dto.anaylsis.ClerkShareGoodsLogDTO;
import com.gic.haoban.manage.api.dto.content.log.ClerkShareMaterialLogDTO;
......@@ -23,6 +24,14 @@ public interface MaterialShareLogApiService {
*/
ServiceResponse<Long> saveClerkShareMaterialLog(ClerkShareMaterialLogDTO clerkShareMaterialLogDTO);
/**
* 转换素材id
* @param materialConvertDTO
* @return
*/
ServiceResponse<List<String>> convertMaterialId(MaterialConvertDTO materialConvertDTO);
/**
* 保存导购分享记录
*
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/content/PotentialCustomerApiService.java
......@@ -28,4 +28,13 @@ public interface PotentialCustomerApiService {
* @return
*/
ServiceResponse<Long> markPotentialCustomer(PotentialCustomerMarkRecordDTO potentialCustomerMarkRecordDTO);
/**
* 更新unionId
* @param enterpriseId
* @param oldUnionId
* @param newUnionId
* @return
*/
ServiceResponse<Void> modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/moment/QwMomentApiService.java 0 → 100644
package com.gic.haoban.manage.api.service.moment;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.moment.*;
import com.gic.haoban.manage.api.qdto.moment.*;
public interface QwMomentApiService {
ServiceResponse<QwMomentPlanDTO> save(QwMomentPlanDTO plan) ;
ServiceResponse<Void> del(Long planId) ;
ServiceResponse<Void> stop(Long planId) ;
ServiceResponse<QwMomentPlanDTO> detail(Long planId) ;
ServiceResponse<Page<QwMomentPlanDTO>> planList(QwMomentPlanQDTO qdto) ;
ServiceResponse<Page<QwMomentPlanAttendDTO>> attendList(PlanClerkListQDTO qdto) ;
ServiceResponse<Page<QwMomentPlanDataDTO>> dataList(PlanDataListQDTO qdto) ;
/**
* 立即发送朋友圈
* @param params
*/
void initTaskClerk(String params) ;
/**
* 定时发送任务创建通知/执行
* @param params
*/
void sendPlanNoticeTimer(String params) ;
/**
* 好办小程序-活动数
* @param qdto
* @return
*/
ServiceResponse<Integer> getTaskNum(TaskNumQDTO qdto) ;
/**
* 好办小程序活动列表
* @param qdto
* @return
*/
ServiceResponse<Page<QwMomentPlanWxaDTO>> planListWxa(PlanListWxaQDTO qdto) ;
/**
* 好办小程序活动任务列表
* @param qdto
* @return
*/
ServiceResponse<Page<TaskListWxaDTO>> taskListWxa(TaskListWxaQDTO qdto) ;
/**
* 好办任务详情
* @param planId
* @param execClerkId
* @return
*/
ServiceResponse<TaskDetailDTO> taskDetail(Long planId, String execClerkId);
/**
* 完成任务
* @param qdto
* @return
*/
ServiceResponse<Void> finishTask(SendResultQDTO qdto);
/**
* 定时拉取企微数据
* @param params
* @return
*/
ServiceResponse<Void> qwDataTimer(String params) ;
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/config/Config.java
package com.gic.haoban.manage.web.config;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableApolloConfig
public class Config {
@Value("${corpid}")
private String corpid;
@Value("${suiteid}")
private String suiteId;
@Value("${host}")
private String host;
@Value("${wxSuiteid}")
private String wxSuiteid;
@Value("${accountName}")
private String accountName;
@Value("${accountNumber}")
private String accountNumber;
@Value("${bankName}")
private String bankName;
public String getAccountName() {
return accountName;
}
public void setAccountName(String accountName) {
this.accountName = accountName;
}
public String getAccountNumber() {
return accountNumber;
}
public void setAccountNumber(String accountNumber) {
this.accountNumber = accountNumber;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
public String getSuiteId() {
return suiteId;
}
public void setSuiteId(String suiteId) {
this.suiteId = suiteId;
}
public String getHost() {
return host;
}
public void setHost(String host) {
this.host = host;
}
public String getWxSuiteid() {
return wxSuiteid;
}
public void setWxSuiteid(String wxSuiteid) {
this.wxSuiteid = wxSuiteid;
}
}
package com.gic.haoban.manage.web.config;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableApolloConfig
public class Config {
@Value("${corpid}")
private String corpid;
@Value("${suiteid}")
private String suiteId;
@Value("${host}")
private String host;
@Value("${wxSuiteid}")
private String wxSuiteid;
@Value("${accountName}")
private String accountName;
@Value("${accountNumber}")
private String accountNumber;
@Value("${bankName}")
private String bankName;
public String getAccountName() {
return accountName;
}
public void setAccountName(String accountName) {
this.accountName = accountName;
}
public String getAccountNumber() {
return accountNumber;
}
public void setAccountNumber(String accountNumber) {
this.accountNumber = accountNumber;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
public String getSuiteId() {
return suiteId;
}
public void setSuiteId(String suiteId) {
this.suiteId = suiteId;
}
public String getHost() {
return host;
}
public void setHost(String host) {
this.host = host;
}
public String getWxSuiteid() {
return wxSuiteid;
}
public void setWxSuiteid(String wxSuiteid) {
this.wxSuiteid = wxSuiteid;
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/LicenceOrderController.java
......@@ -46,6 +46,7 @@ import java.util.List;
@RequestMapping("/operation-licence-order")
public class LicenceOrderController {
private static Logger logger = LogManager.getLogger(LicenceOrderController.class);
@Autowired
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/qo/licence/LicenceOrderQO.java
package com.gic.haoban.manage.web.qo.licence;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class LicenceOrderQO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 订单类型，1：购买帐号，2：续期帐号
*/
private Integer orderType;
/**
* 互通帐号个数
*/
private Integer externalContactCount;
// /**
// * 基础帐号个数
// */
// private Integer baseCount;
/**
* 订单金额，单位分
*/
private Integer price;
/**
* 购买时间类型 1：按月购买，2：按天购买
*/
private Integer timeType;
/**
* 购买的时间数值
*/
private Integer timeValue;
/**
* 支付类型 1在线支付 2对公转账
*/
private Integer payType;
/**
* 校验金额
*/
public Integer checkPrice(){
if (this.externalContactCount ==null || this.externalContactCount<0){
return -1;
}
Integer myPrice=0;
//根据企业微信的计费规则计算
if (this.externalContactCount<=5){
myPrice = 50*this.externalContactCount;
} else if (this.externalContactCount<=200) {
myPrice = 250+40*(this.externalContactCount-5);
} else if (this.externalContactCount<=500) {
myPrice = 8050+30*(this.externalContactCount-200);
} else if (this.externalContactCount<=1000) {
myPrice = 17050+20*(this.externalContactCount-500);
} else if (this.externalContactCount<=10000) {
myPrice = 27050+10*(this.externalContactCount-1000);
}else {
return -1;
}
//转化为分
myPrice = myPrice*this.timeValue*100;
if (this.timeType == 1){
//企业微信的规则： 12.312，最终保留的是12.32
if (myPrice%12==0){
myPrice = myPrice/12;
}else {
myPrice = myPrice/12+1;
}
}else {
if (myPrice%372==0){
myPrice = myPrice/372;
}else {
myPrice = myPrice/372+1;
}
}
if (!this.price .equals(myPrice)){
return 0;
}
return 1;
}
}
package com.gic.haoban.manage.web.qo.licence;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class LicenceOrderQO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 订单类型，1：购买帐号，2：续期帐号
*/
private Integer orderType;
/**
* 互通帐号个数
*/
private Integer externalContactCount;
// /**
// * 基础帐号个数
// */
// private Integer baseCount;
/**
* 订单金额，单位分
*/
private Integer price;
/**
* 购买时间类型 1：按月购买，2：按天购买
*/
private Integer timeType;
/**
* 购买的时间数值
*/
private Integer timeValue;
/**
* 支付类型 1在线支付 2对公转账
*/
private Integer payType;
/**
* 校验金额
*/
public Integer checkPrice(){
if (this.externalContactCount ==null || this.externalContactCount<0){
return -1;
}
Integer myPrice=0;
//根据企业微信的计费规则计算
if (this.externalContactCount<=5){
myPrice = 50*this.externalContactCount;
} else if (this.externalContactCount<=200) {
myPrice = 250+40*(this.externalContactCount-5);
} else if (this.externalContactCount<=500) {
myPrice = 8050+30*(this.externalContactCount-200);
} else if (this.externalContactCount<=1000) {
myPrice = 17050+20*(this.externalContactCount-500);
} else if (this.externalContactCount<=10000) {
myPrice = 27050+10*(this.externalContactCount-1000);
}else {
return -1;
}
//转化为分
myPrice = myPrice*this.timeValue*100;
if (this.timeType == 1){
//企业微信的规则： 12.312，最终保留的是12.32
if (myPrice%12==0){
myPrice = myPrice/12;
}else {
myPrice = myPrice/12+1;
}
}else {
if (myPrice%372==0){
myPrice = myPrice/372;
}else {
myPrice = myPrice/372+1;
}
}
if (!this.price .equals(myPrice)){
return 0;
}
return 1;
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderProgressVO.java
package com.gic.haoban.manage.web.vo.licence;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class LicenceOrderProgressVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
/**
* 订单状态
*/
private String orderStatus;
/**
* 标记字段 1好办后台
*/
private Integer type;
/**
* 上传凭证url
*/
private String voucher;
/**
* 原因
*/
private String reason;
/**
* 创建时间
*/
private Date createTime;
}
package com.gic.haoban.manage.web.vo.licence;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class LicenceOrderProgressVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
/**
* 订单状态
*/
private String orderStatus;
/**
* 标记字段 1好办后台
*/
private Integer type;
/**
* 上传凭证url
*/
private String voucher;
/**
* 原因
*/
private String reason;
/**
* 创建时间
*/
private Date createTime;
}
haoban-manage3-service/pom.xml
......@@ -209,6 +209,11 @@
<version>${gic-message-center-api}</version>
</dependency>
<dependency>
<groupId>com.freewayso</groupId>
<artifactId>image-combiner</artifactId>
<version>2.6.3</version>
</dependency>
<dependency>
<groupId>com.gic.operating</groupId>
<artifactId>gic-operating-api</artifactId>
<version>${gic-operating-api}</version>
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/QywxTagRelationMapper.java
......@@ -10,29 +10,13 @@ import java.util.List;
public interface QywxTagRelationMapper {
/**
*/
int deleteByPrimaryKey(String qywxTagRelationId);
/**
*/
int insert(TabQywxTagRelation record);
/**
*/
int insertSelective(TabQywxTagRelation record);
/**
*/
// TabQywxTagRelation selectByPrimaryKey(String qywxTagRelationId);
/**
*/
int updateByPrimaryKeySelective(TabQywxTagRelation record);
/**
*/
int updateByPrimaryKey(TabQywxTagRelation record);
/**
* 查询企业下所有同步的
*
* @param wxEnterpriseId
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
......@@ -33,6 +33,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
int delByStoreIds(@Param("storeIds") Collection<String> storeIds);
List<TabHaobanExternalClerkRelated> listByStaffId(@Param("staffId") String staffId) ;
void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid") String externalUserid,
@Param("staffId") String staffId,
......@@ -374,7 +375,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
@Param("staffId") String staffId);
List<String> listMemberAndClerk(@Param("memberIdList")List<String> memberIdList, @Param("clerkIdList")List<String> clerkIdList, @Param("enterpriseId")String enterpriseId);
List<String> listFriendClerk(@Param("memberId") String memberId , @Param("clerkIdList")List<String> clerkIdList) ;
int getCountExternalClerk(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("staffId") String staffId,
@Param("statusFlags") List<Integer> statusFlags);
......@@ -439,6 +442,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
*/
String getMemberIdByExternalId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserId") String externalUserId);
String getEnterpriseMemberIdByExternalId(@Param("enterpriseId")String enterpriseId, @Param("externalUserId") String externalUserId);
int halfFriendCount(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId")String storeId, @Param("clerkId")String clerkId, @Param("staffId")String staffId);
List<TabHaobanExternalClerkRelated> halfFriendPage(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId")String storeId, @Param("clerkId")String clerkId, @Param("staffId")String staffId, @Param("type")int type);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanMaterialCategoryMapper.java
......@@ -8,23 +8,22 @@ import com.gic.haoban.manage.api.dto.MaterialCategoryDTO;
import com.gic.haoban.manage.service.entity.TabHaobanMaterialCategory;
public interface TabHaobanMaterialCategoryMapper {
int deleteByPrimaryKey(String categoryId);
int insert(TabHaobanMaterialCategory record);
int insertSelective(TabHaobanMaterialCategory record);
int getMaxSortNum(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("parentId")String parentId) ;
TabHaobanMaterialCategory selectByPrimaryKey(String categoryId);
int updateByPrimaryKeySelective(TabHaobanMaterialCategory record);
int updateByPrimaryKey(TabHaobanMaterialCategory record);
TabHaobanMaterialCategory selectByCategoryNameAndParentId(@Param("categoryName")String categoryName,
@Param("categoryParentId")String categoryParentId,
@Param("wxEnterpriseId")String wxEnterpriseId);
List<TabHaobanMaterialCategory> listCategory(@Param("wxEnterpriseId")String wxEnterpriseId);
List<TabHaobanMaterialCategory> listByParentCategory(@Param("categoryId")String categoryId);
List<TabHaobanMaterialCategory> listByParentCategory(@Param("wxEnterpriseId")String wxEnterpriseId , @Param("categoryId")String categoryId);
void updateSortNum(@Param("list")List<MaterialCategoryDTO> list);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabMiniprogramSettingMapper.java
......@@ -56,5 +56,5 @@ public interface TabMiniprogramSettingMapper {
* @param appId
* @return
*/
public TabMiniprogramSetting getMiniprogramSettingByAppId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("appId") String appId);
public List<TabMiniprogramSetting> getMiniprogramSettingByAppId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("appId") String appId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatPlanOwnerLogMapper.java
......@@ -74,7 +74,5 @@ public interface GroupChatPlanOwnerLogMapper {
int getInvalidTask(@Param("enterpriseId")String enterpriseId , @Param("clerkId")String clerkId , @Param("time")Date time ) ;
int getOverdueTask(@Param("enterpriseId")String enterpriseId , @Param("clerkId")String clerkId , @Param("time")Date time ) ;
int getTaskNum(@Param("enterpriseId")String enterpriseId, @Param("clerkId")String clerkId, @Param("storeId")String storeId, @Param("staffId")String staffId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/content/TabHaobanInteractRecordMapper.java
......@@ -136,5 +136,12 @@ public interface TabHaobanInteractRecordMapper {
*/
int memberAuthorized(@Param("memberId") String memberId, @Param("unionId") String unionId);
/**
* 更新unionId
* @param enterpriseId
* @return
*/
int modifyUnionId(@Param("enterpriseId") String enterpriseId, @Param("oldUnionId") String oldUnionId, @Param("newUnionId") String newUnionId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/content/TabHaobanPotentialCustomerMapper.java
......@@ -93,5 +93,13 @@ public interface TabHaobanPotentialCustomerMapper {
*/
int updateMemberDealRecordNum(@Param("enterpriseId") String enterpriseId, @Param("memberId") String memberId);
/**
* 更新unionId
* @param enterpriseId
* @return
*/
int modifyUnionId(@Param("enterpriseId") String enterpriseId, @Param("oldUnionId") String oldUnionId, @Param("newUnionId") String newUnionId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/licence/TabHaobanLicenceOrderProgressMapper.java
package com.gic.haoban.manage.service.dao.mapper.licence;
import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrderProgress;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author jx
* @since 2023-03-09
*/
public interface TabHaobanLicenceOrderProgressMapper {
/**
* 插入订单进度数据
* @param tabHaobanLicenceOrderProgress
* @return
*/
Integer insert(TabHaobanLicenceOrderProgress tabHaobanLicenceOrderProgress);
List<TabHaobanLicenceOrderProgress> getListByOrderId(@Param("orderId") Long orderId,@Param("type") Integer type);
Integer deleteByOrderId(@Param("orderId") Long orderId);
Integer uploadLicenceOrderVoucher(@Param("orderId")Long orderId, @Param("voucher")String voucher);
}
package com.gic.haoban.manage.service.dao.mapper.licence;
import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrderProgress;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author jx
* @since 2023-03-09
*/
public interface TabHaobanLicenceOrderProgressMapper {
/**
* 插入订单进度数据
* @param tabHaobanLicenceOrderProgress
* @return
*/
Integer insert(TabHaobanLicenceOrderProgress tabHaobanLicenceOrderProgress);
List<TabHaobanLicenceOrderProgress> getListByOrderId(@Param("orderId") Long orderId,@Param("type") Integer type);
Integer deleteByOrderId(@Param("orderId") Long orderId);
Integer uploadLicenceOrderVoucher(@Param("orderId")Long orderId, @Param("voucher")String voucher);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/moment/QwMomentPlanAttendMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper.moment;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanAttendDTO;
import com.gic.haoban.manage.api.dto.moment.TaskDetailDTO;
import com.gic.haoban.manage.api.dto.moment.TaskListWxaDTO;
import com.gic.haoban.manage.api.qdto.moment.PlanClerkListQDTO;
import com.gic.haoban.manage.api.qdto.moment.TaskListWxaQDTO;
import com.gic.haoban.manage.service.entity.moment.TabQwMomentPlanAttend;
import com.gic.haoban.manage.service.pojo.bo.moment.CountBO;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface QwMomentPlanAttendMapper {
TabQwMomentPlanAttend getById(Long attendId) ;
void batchInsert(List<TabQwMomentPlanAttend> list) ;
/**
* 查询已经存在的导购
* @param planId
* @param clerkIdList
* @return
*/
List<String> listExistClerkIds(@Param("planId") Long planId , @Param("list") List<String> clerkIdList) ;
List<QwMomentPlanAttendDTO> listClerk(@Param("planId")Long planId , @Param("statusFlag")Integer statusFlag);
List<TabQwMomentPlanAttend> listForData(@Param("planId")Long planId);
/**
* 删除
* @param planId
* @param clerkIdList
*/
void delClerks(@Param("planId") Long planId , @Param("list") List<String> clerkIdList) ;
List<QwMomentPlanAttendDTO> list(PlanClerkListQDTO qdto);
TaskDetailDTO taskDetail(@Param("planId") Long planId, @Param("clerkId") String execClerkId);
List<TabQwMomentPlanAttend> getByStaff(@Param("planId") Long planId, @Param("staffId") String staffId);
List<TaskListWxaDTO> taskListWxa(TaskListWxaQDTO qdto);
void finishTask(@Param("attendId")Long attendId, @Param("sendTime")Date sendTime , @Param("staffId") String staffId);
void updateMomentId(@Param("id") Long id, @Param("momentId") String jobId);
void updateFail(@Param("planId") Long planId, @Param("list") List<String> clerkIdList , @Param("reason") String reason) ;
void updateSuccess(@Param("planId") Long planId, @Param("list") List<String> clerkIdList) ;
void updateSuccessStaff(@Param("planId") Long planId, @Param("clerkId") String clerkId , @Param("staffId") String staffId) ;
void updateQwData(@Param("planId") Long planId, @Param("clerkId") String clerkId, @Param("likeCount")int likeCount, @Param("commentCount")int commentCount);
CountBO getQwCount(@Param("planId")Long planId);
int getTotalTask(@Param("enterpriseId")String enterpriseId , @Param("clerkId")String clerkId , @Param("time")Date time ) ;
int getInvalidTask(@Param("enterpriseId")String enterpriseId , @Param("clerkId")String clerkId , @Param("time")Date time ) ;
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/moment/QwMomentPlanDataMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper.moment;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDataDTO;
import com.gic.haoban.manage.api.qdto.moment.PlanDataListQDTO;
import com.gic.haoban.manage.service.entity.moment.TabQwMomentPlanData;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface QwMomentPlanDataMapper {
void batchInsert(List<TabQwMomentPlanData> list) ;
List<QwMomentPlanDataDTO> list(PlanDataListQDTO qdto);
void delAll(@Param("planId") Long planId, @Param("clerkId")String clerkId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/moment/QwMomentPlanMapper.java 0 → 100644
package com.gic.haoban.manage.service.dao.mapper.moment;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanWxaDTO;
import com.gic.haoban.manage.api.qdto.moment.PlanListWxaQDTO;
import com.gic.haoban.manage.api.qdto.moment.QwMomentPlanQDTO;
import com.gic.haoban.manage.api.qdto.moment.TaskNumQDTO;
import com.gic.haoban.manage.service.entity.moment.TabQwMomentPlan;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface QwMomentPlanMapper {
void insert(TabQwMomentPlan tab) ;
void update(TabQwMomentPlan tab) ;
void del(@Param("planId") Long planId) ;
void stop(@Param("planId") Long planId) ;
TabQwMomentPlan getById(@Param("planId") Long planId) ;
void updateClerkNum(@Param("planId")Long planId, @Param("totalNum")int totalNum , @Param("taskClerkNum")int taskClerkNum , @Param("doneNum")int doneNum);
List<TabQwMomentPlan> list(QwMomentPlanQDTO qdto);
List<QwMomentPlanWxaDTO> planListWxa(PlanListWxaQDTO qdto);
int getTaskNum(TaskNumQDTO qdto);
void updateJobid(@Param("planId") Long planId, @Param("jobId") String jobId);
void updateMomentId(@Param("planId") Long planId, @Param("momentId") String jobId);
void updateQwData(@Param("planId") Long planId, @Param("like") int like, @Param("comment") int comment);
List<Long> listForData(@Param("type")int type);
List<TabQwMomentPlan> listForStop(@Param("time")Date time);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanMaterialCategory.java
......@@ -18,8 +18,18 @@ public class TabHaobanMaterialCategory implements Serializable {
private Date updateTime;
private Integer sortNum;
private static final long serialVersionUID = 1L;
public Integer getSortNum() {
return sortNum;
}
public void setSortNum(Integer sortNum) {
this.sortNum = sortNum;
}
public String getCategoryId() {
return categoryId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/licence/TabHaobanLicenceOrderProgress.java
package com.gic.haoban.manage.service.entity.licence;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class TabHaobanLicenceOrderProgress implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
/**
* gic商户Id
*/
private String enterpriseId;
/**
* wx企业Id
*/
private String wxEnterpriseId;
/**
* 订单id
*/
private Long orderId;
/**
* 订单状态
*/
private String orderStatus;
/**
* 标记字段 1好办后台
*/
private Integer type;
/**
* 上传凭证url
*/
private String voucher;
/**
* 原因
*/
private String reason;
/**
* 逻辑删除，0未删除，1删除
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人名称
*/
private String creatorName;
}
package com.gic.haoban.manage.service.entity.licence;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class TabHaobanLicenceOrderProgress implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
/**
* gic商户Id
*/
private String enterpriseId;
/**
* wx企业Id
*/
private String wxEnterpriseId;
/**
* 订单id
*/
private Long orderId;
/**
* 订单状态
*/
private String orderStatus;
/**
* 标记字段 1好办后台
*/
private Integer type;
/**
* 上传凭证url
*/
private String voucher;
/**
* 原因
*/
private String reason;
/**
* 逻辑删除，0未删除，1删除
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人名称
*/
private String creatorName;
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/moment/TabQwMomentPlan.java 0 → 100644
package com.gic.haoban.manage.service.entity.moment;
import java.io.Serializable;
import java.util.Date;
/**
*
* @ClassName: TabHaobanQwMomentPlan
* @Description: TODO
* @Author 徐高华
* @Date 2025年03月05日 15:46:30
* @Modify
* @CopyRight 杭州
*/
public class TabQwMomentPlan implements Serializable{
private static final long serialVersionUID = 85646353131100L;
/**活动id*/
private Long planId;
/**名称*/
private String title;
/**描述*/
private String remark;
/**开始日期*/
private Date beginDate;
/**结束日期*/
private Date endDate;
/**几天后失效*/
private Integer expireDays;
/**执行方式 0企微1好办小程序*/
private Integer execType;
/**企微id*/
private String wxEnterpriseId;
/**企业id*/
private String enterpriseId;
/**创建人*/
private String creatorId;
/**创建人*/
private String creatorName;
/**1有效 2终止*/
private Integer statusFlag;
/**1删0有效*/
private Integer deleteFlag;
/**1立即发布2定时发布*/
private Integer publishType;
/**发布时间*/
private Date publishTime;
/**0全部导购 1部分导购*/
private Integer planClerkType;
/**总任务数*/
private Integer totalNum;
/**执行任务数*/
private Integer doneNum;
/**终止时间*/
private Date stopTime;
/**0自主上传 1内容*/
private Integer mediaType;
/**素材json*/
private String mediaInfo;
/**素材回显内容*/
private String mediaInfoShow;
/**创建时间*/
private Date createTime;
/**更新时间*/
private Date updateTime;
/**总点赞数*/
private Integer totalLikeCount;
/**总评论数*/
private Integer totalCommentCount;
/**企微jobid*/
private String qwJobid;
/**朋友圈id */
private String momentId ;
/**完成率*/
private Integer execRate;
private Integer taskClerkNum ;
/**
* 链接开关
*/
private Integer mediaLinkFlag ;
public Integer getMediaLinkFlag() {
return mediaLinkFlag;
}
public void setMediaLinkFlag(Integer mediaLinkFlag) {
this.mediaLinkFlag = mediaLinkFlag;
}
public Integer getTaskClerkNum() {
return taskClerkNum;
}
public void setTaskClerkNum(Integer taskClerkNum) {
this.taskClerkNum = taskClerkNum;
}
public String getMomentId() {
return momentId;
}
public void setMomentId(String momentId) {
this.momentId = momentId;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Date getBeginDate() {
return beginDate;
}
public void setBeginDate(Date beginDate) {
this.beginDate = beginDate;
}
public Date getEndDate() {
return endDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public Integer getExpireDays() {
return expireDays;
}
public void setExpireDays(Integer expireDays) {
this.expireDays = expireDays;
}
public Integer getExecType() {
return execType;
}
public void setExecType(Integer execType) {
this.execType = execType;
}
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 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 Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Integer getPublishType() {
return publishType;
}
public void setPublishType(Integer publishType) {
this.publishType = publishType;
}
public Date getPublishTime() {
return publishTime;
}
public void setPublishTime(Date publishTime) {
this.publishTime = publishTime;
}
public Integer getPlanClerkType() {
return planClerkType;
}
public void setPlanClerkType(Integer planClerkType) {
this.planClerkType = planClerkType;
}
public Integer getTotalNum() {
return totalNum;
}
public void setTotalNum(Integer totalNum) {
this.totalNum = totalNum;
}
public Integer getDoneNum() {
return doneNum;
}
public void setDoneNum(Integer doneNum) {
this.doneNum = doneNum;
}
public Date getStopTime() {
return stopTime;
}
public void setStopTime(Date stopTime) {
this.stopTime = stopTime;
}
public Integer getMediaType() {
return mediaType;
}
public void setMediaType(Integer mediaType) {
this.mediaType = mediaType;
}
public String getMediaInfo() {
return mediaInfo;
}
public void setMediaInfo(String mediaInfo) {
this.mediaInfo = mediaInfo;
}
public String getMediaInfoShow() {
return mediaInfoShow;
}
public void setMediaInfoShow(String mediaInfoShow) {
this.mediaInfoShow = mediaInfoShow;
}
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 getTotalLikeCount() {
return totalLikeCount;
}
public void setTotalLikeCount(Integer totalLikeCount) {
this.totalLikeCount = totalLikeCount;
}
public Integer getTotalCommentCount() {
return totalCommentCount;
}
public void setTotalCommentCount(Integer totalCommentCount) {
this.totalCommentCount = totalCommentCount;
}
public String getQwJobid() {
return qwJobid;
}
public void setQwJobid(String qwJobid) {
this.qwJobid = qwJobid;
}
public Integer getExecRate() {
return execRate;
}
public void setExecRate(Integer execRate) {
this.execRate = execRate;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/moment/TabQwMomentPlanAttend.java 0 → 100644
package com.gic.haoban.manage.service.entity.moment;
import java.io.Serializable;
import java.util.Date;
/**
*
* @ClassName: TabHaobanQwMomentPlanAttend
* @Description: TODO
* @Author 徐高华
* @Date 2025年03月05日 15:21:31
* @Modify
* @CopyRight 杭州
*/
public class TabQwMomentPlanAttend implements Serializable{
private static final long serialVersionUID = 85681326319600L;
/**id*/
private Long attendId;
/**计划id*/
private Long planId;
/**企微企业id*/
private String wxEnterpriseId;
/**企业id*/
private String enterpriseId;
/**staff*/
private String staffId;
/**导购*/
private String clerkId;
/**导购code*/
private String clerkCode;
/**导购名称*/
private String clerkName;
/**创建时间*/
private Date createTime;
/**更新时间*/
private Date updateTime;
/**是否删除*/
private Integer deleteFlag;
/**评论数*/
private Integer commentCount;
/**点赞数*/
private Integer likeCount;
/**1待执行 2已执行*/
private Integer taskStatus;
/**任务执行时间*/
private Date sendTime;
/**企微朋友圈id*/
private String momentId;
/**企微获取数据时间*/
private Date qwDataTime;
/**门店id*/
private String storeId;
// 0待下发 1已下发
private Integer statusFlag ;
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Long getAttendId() {
return attendId;
}
public void setAttendId(Long attendId) {
this.attendId = attendId;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
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 getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
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;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Integer getCommentCount() {
return commentCount;
}
public void setCommentCount(Integer commentCount) {
this.commentCount = commentCount;
}
public Integer getLikeCount() {
return likeCount;
}
public void setLikeCount(Integer likeCount) {
this.likeCount = likeCount;
}
public Integer getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(Integer taskStatus) {
this.taskStatus = taskStatus;
}
public Date getSendTime() {
return sendTime;
}
public void setSendTime(Date sendTime) {
this.sendTime = sendTime;
}
public String getMomentId() {
return momentId;
}
public void setMomentId(String momentId) {
this.momentId = momentId;
}
public Date getQwDataTime() {
return qwDataTime;
}
public void setQwDataTime(Date qwDataTime) {
this.qwDataTime = qwDataTime;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/moment/TabQwMomentPlanData.java 0 → 100644
package com.gic.haoban.manage.service.entity.moment;
import java.io.Serializable;
import java.util.Date;
/**
*
* @ClassName: TabHaobanQwMomentPlanData
* @Description: TODO
* @Author 徐高华
* @Date 2025年03月05日 11:24:04
* @Modify
* @CopyRight 杭州
*/
public class TabQwMomentPlanData implements Serializable{
private static final long serialVersionUID = 69664410786500L;
/**id*/
private Long dataId;
/**计划id*/
private Long planId;
/**企微企业id*/
private String wxEnterpriseId;
/**企业id*/
private String enterpriseId;
/**staff*/
private String staffId;
/**导购*/
private String clerkId;
private String clerkCode ;
private String clerkName ;
/**门店id*/
private String storeId;
/**客户id*/
private String memberId;
/**创建时间*/
private Date createTime;
/**更新时间*/
private Date updateTime;
/**是否删除*/
private Integer deleteFlag;
/**评论时间*/
private Date commentTime;
/**点赞时间*/
private Date likeTime;
/**是否评论*/
private Integer commentFlag;
/**是否点赞*/
private Integer likeFlag;
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public Long getDataId() {
return dataId;
}
public void setDataId(Long dataId) {
this.dataId = dataId;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
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 getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
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 getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Date getCommentTime() {
return commentTime;
}
public void setCommentTime(Date commentTime) {
this.commentTime = commentTime;
}
public Date getLikeTime() {
return likeTime;
}
public void setLikeTime(Date likeTime) {
this.likeTime = likeTime;
}
public Integer getCommentFlag() {
return commentFlag;
}
public void setCommentFlag(Integer commentFlag) {
this.commentFlag = commentFlag;
}
public Integer getLikeFlag() {
return likeFlag;
}
public void setLikeFlag(Integer likeFlag) {
this.likeFlag = likeFlag;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/ClerkStaffBO.java 0 → 100644
package com.gic.haoban.manage.service.pojo;
import java.io.Serializable;
public class ClerkStaffBO implements Serializable {
private String clerkId ;
private String staffId ;
// 0成功 1导购已删除 2未绑定成员
private int code ;
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/QywxSyncTagFormatPojo.java
......@@ -12,19 +12,19 @@ import java.util.Set;
*/
public class QywxSyncTagFormatPojo implements Serializable {
/**
* 企业微信与gic标签项对应map
* 企业微信标签值ID -> gic标签值ID
*/
private Map<String, String> qywxToGicTagItemIdMap;
/**
* gic与企业微信标签项对应map
* gic标签值ID -> 企业微信标签值ID
*/
private Map<String, String> gicToQywxTagItemIdMap;
/**
* 商户对应的企业微信标签列表
* gic企业ID -> 企业微信标签值ID LIST
*/
private Map<String, Set<String>> entQywxTagKeysMap;
/**
* 商户对应的gic标签列表
* gic企业ID -> gic标签值ID LIST
*/
private Map<String, Set<String>> entGicTagItemIdMap;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/moment/CountBO.java 0 → 100644
package com.gic.haoban.manage.service.pojo.bo.moment;
public class CountBO {
private Integer likeCount ;
private Integer commentCount ;
public Integer getLikeCount() {
return likeCount;
}
public void setLikeCount(Integer likeCount) {
this.likeCount = likeCount;
}
public Integer getCommentCount() {
return commentCount;
}
public void setCommentCount(Integer commentCount) {
this.commentCount = commentCount;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/moment/StaffClerkBO.java 0 → 100644
package com.gic.haoban.manage.service.pojo.bo.moment;
public class StaffClerkBO {
private String staffId ;
private String clerkId ;
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/ClerkMainStoreRelatedService.java
......@@ -14,7 +14,7 @@ public interface ClerkMainStoreRelatedService {
TabHaobanClerkMainStoreRelated selectByWxEnterpriseIdAndStoreId(String staffId, String wxEnterpriseId);
TabHaobanClerkMainStoreRelated selectStaffMainStore(String staffId, String wxEnterpriseId);
/**
* 获取主门店 如果没有主门店设置主门店
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MaterialCategoryService.java
......@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service;
import java.util.List;
import com.gic.haoban.manage.api.dto.MaterialCategoryDTO;
import com.gic.haoban.manage.api.dto.qdto.MaterialCategorySortQDTO;
public interface MaterialCategoryService {
......@@ -16,6 +17,7 @@ public interface MaterialCategoryService {
void editCategory(MaterialCategoryDTO materialCategoryDTO);
List<MaterialCategoryDTO> listByParentCategory(String categoryId);
List<MaterialCategoryDTO> listByParentCategory(String wxEnterpriseId , String categoryId);
void materialSortCategory(MaterialCategorySortQDTO qdto);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanOwnerLogServiceImpl.java
......@@ -233,6 +233,14 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
qdto.setClerkId(qdto.getSearchClerkId());
}
}
if(clerkType > 1) {
storeId = qdto.getStoreId();
clerkId = null;
qdto.setClerkId(null);
if (StringUtils.isNotBlank(qdto.getSearchClerkId())) {
qdto.setClerkId(qdto.getSearchClerkId());
}
}
qdto.setStoreId(storeId);
List<GroupChatPlanOwnerLogDTO> list = this.groupChatPlanOwnerLogMapper.listOwnerLogPageForWxa(qdto);
if (CollectionUtils.isNotEmpty(list)) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java
......@@ -23,6 +23,7 @@ import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
import com.gic.haoban.manage.service.dao.mapper.chat.*;
import com.gic.haoban.manage.service.dao.mapper.moment.QwMomentPlanAttendMapper;
import com.gic.haoban.manage.service.service.StaffClerkRelationService;
import com.gic.haoban.manage.service.service.content.impl.GroupMessageServiceImpl;
import com.gic.haoban.manage.service.util.StreamUtils;
......@@ -139,6 +140,8 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
private StaffClerkRelationService staffClerkRelationService ;
@Autowired
private SettingApiService settingApiService ;
@Autowired
private QwMomentPlanAttendMapper qwMomentPlanAttendMapper ;
private static GicMQClient mqClient = GICMQClientUtil.getClientInstance();
......@@ -177,7 +180,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
//处理群发素材上传生成新的url
// String chatContent = dealContentMaterial(dto.getEnterpriseId(), entity);
// entity.setChatContent(chatContent);
entity.setStartTime(entity.getSendTime());
entity.setStartTime(entity.getSendTime());
Date endTime = DateUtil.addDay(entity.getStartTime(), entity.getExpireDays());
entity.setEndTime(DateUtil.getEndTimeOfDay(endTime));
String staffIdList = dto.getStaffIdList();
......@@ -303,7 +306,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
public Page<GroupChatPlanBO> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
if (StringUtils.isNotBlank(qdto.getSearchParams())) {
String params = qdto.getSearchParams();
qdto.setSearchParams("%" + params + "%");
qdto.setSearchParamsLike("%" + params + "%");
}
PageHelper.startPage(basePageInfo);
List<TabGroupChatPlan> list = this.groupChatPlanMapper.list(qdto);
......@@ -951,8 +954,13 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
logger.info("clerkId={}",total);
if(total > 0) {
int invalid = this.groupChatPlanOwnerLogMapper.getInvalidTask(enterpriseId,clerkId,date) ;
int overdue = this.groupChatPlanOwnerLogMapper.getOverdueTask(enterpriseId,clerkId,date) ;
this.qywxGroupSendCanvasApiService.saveNoticeLog(enterpriseId,clerkId,total,overdue,invalid,"chat") ;
this.qywxGroupSendCanvasApiService.saveNoticeLog(enterpriseId,clerkId,total,0,invalid,"chat") ;
}
// 朋友圈
int momentTotal = this.qwMomentPlanAttendMapper.getTotalTask(enterpriseId,clerkId,date) ;
if(momentTotal > 0) {
int invalid = this.qwMomentPlanAttendMapper.getInvalidTask(enterpriseId,clerkId,date) ;
this.qywxGroupSendCanvasApiService.saveNoticeLog(enterpriseId,clerkId,momentTotal,0,invalid,"moment") ;
}
}
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/InteractRecordService.java
......@@ -79,6 +79,14 @@ public interface InteractRecordService {
// void modifyFollowTime(String enterpriseId,String clerkId, String memberId);
/**
* 更新unionId
* @param enterpriseId
* @param oldUnionId
* @param newUnionId
*/
void modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId);
/**
* 查询会员对应时间后最新的互动记录
* @param enterpriseId
* @param clerkId
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/PotentialCustomerService.java
package com.gic.haoban.manage.service.service.content;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.service.pojo.bo.content.PotentialCustomerBO;
import com.gic.haoban.manage.service.pojo.bo.content.context.PotentialCustomerNotifyContext;
import com.gic.haoban.manage.service.pojo.qo.content.PotentialCustomerQO;
......@@ -69,4 +70,13 @@ public interface PotentialCustomerService {
* @param memberId
*/
void updateMemberDealFlag(String enterpriseId, String memberId);
/**
* 更新unionId
* @param enterpriseId
* @param oldUnionId
* @param newUnionId
*/
void modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/WeekMonthReportBuilder.java
......@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Optional;
......@@ -180,11 +181,14 @@ public class WeekMonthReportBuilder {
String bizDate = null;
if (MaterialReportType.WEEK.getCode().equals(reportType)) {
// 周报
bizDate = DateUtil.beginOfWeek(DateUtil.lastWeek()).toString("yyyy-MM-dd");
// bizDate = DateUtil.beginOfWeek(DateUtil.lastWeek()).toString("yyyy-MM-dd");
bizDate = DateUtil.beginOfWeek(new Date()).toString("yyyy-MM-dd");
} else {
// 月报
bizDate = DateUtil.beginOfMonth(DateUtil.lastMonth()).toString("yyyy-MM");
// bizDate = DateUtil.beginOfMonth(DateUtil.lastMonth()).toString("yyyy-MM");
bizDate = DateUtil.beginOfMonth(new Date()).toString("yyyy-MM");
}
log.info(DateUtil.lastMonth().toDateStr());
log.info("计算周月报的周期:{}",bizDate);
......@@ -213,8 +217,11 @@ public class WeekMonthReportBuilder {
articleInfo.setTitle(context.getMessageTitle());
articleInfo.setDescription(context.getMessageDesc());
String extendParams = StringUtils.isNotBlank(context.getMainStoreId()) ? context.getMainStoreId() : context.getEnterpriseId();
//articleInfo.setPagepath(NoticeMessageUtil.buildMiniAppUrl(NoticeMessageTypeEnum.MATERIAL_REPORT_NOTIFY, context.extendParams(extendParams)));
final NoticeMessageTypeEnum noticeMessageTypeEnum = MaterialReportType.WEEK.getCode().equals(context.getReportType()) ? NoticeMessageTypeEnum.MATERIAL_REPORT_NOTIFY_WEEK : NoticeMessageTypeEnum.MATERIAL_REPORT_NOTIFY_MONTH;
articleInfo.setPagepath(NoticeMessageUtil.buildMiniAppUrl(noticeMessageTypeEnum, context.extendParams(extendParams)));
articleInfo.setPagepath(NoticeMessageUtil.buildMiniAppUrl(noticeMessageTypeEnum, context.extendParams(extendParams)));
articleInfo.setPicurl(context.getMaterialReportUrl());
newsSendMessage.setArticleMessages(Collections.singletonList(articleInfo));
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/InteractRecordServiceImpl.java
......@@ -262,6 +262,11 @@ public class InteractRecordServiceImpl implements InteractRecordService {
}
@Override
public void modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId) {
tabHaobanInteractRecordMapper.modifyUnionId(enterpriseId, oldUnionId, newUnionId);
}
@Override
public List<InteractRecordBO> lastInteractRecord(String enterpriseId, String clerkId, List<MemberLastInteractBO> list) {
if (CollectionUtils.isEmpty(list)) {
return new ArrayList<>();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/PotentialCustomerServiceImpl.java
......@@ -345,4 +345,9 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
}
potentialCustomerMapper.updateMemberDealRecordNum(enterpriseId, memberId);
}
@Override
public void modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId) {
potentialCustomerMapper.modifyUnionId(enterpriseId, oldUnionId, newUnionId);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ClerkMainStoreRelatedServiceImpl.java
package com.gic.haoban.manage.service.service.impl;
import com.gic.commons.util.ToolUtil;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
......@@ -26,7 +27,7 @@ import static org.slf4j.LoggerFactory.getLogger;
@Service
public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedService {
private static final Logger logger = getLogger(ClerkMainStoreRelatedServiceImpl.class);
private static final Logger logger = getLogger(ClerkMainStoreRelatedService.class);
@Autowired
private TabHaobanClerkMainStoreRelatedMapper mapper;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialCategoryServiceImpl.java
......@@ -3,6 +3,8 @@ package com.gic.haoban.manage.service.service.impl;
import java.util.Date;
import java.util.List;
import com.gic.haoban.manage.api.dto.qdto.MaterialCategorySortQDTO;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -30,7 +32,15 @@ public class MaterialCategoryServiceImpl implements MaterialCategoryService{
materialCategoryDTO.setCreateTime(new Date());
materialCategoryDTO.setUpdateTime(materialCategoryDTO.getCreateTime());
materialCategoryDTO.setStatusFlag(1);
materialCategoryDTO.setSortNum(-1);
mapper.insert(EntityUtil.changeEntityByJSON(TabHaobanMaterialCategory.class, materialCategoryDTO));
// 修改排序
List<MaterialCategoryDTO> list = this.listByParentCategory(materialCategoryDTO.getWxEnterpriseId(),materialCategoryDTO.getCategoryParentId()) ;
for(int i=0;i<list.size();i++) {
MaterialCategoryDTO item = list.get(i) ;
item.setSortNum(i+1);
}
this.mapper.updateSortNum(list);
}
@Override
......@@ -50,8 +60,55 @@ public class MaterialCategoryServiceImpl implements MaterialCategoryService{
}
@Override
public List<MaterialCategoryDTO> listByParentCategory(String categoryId) {
return EntityUtil.changeEntityListByJSON(MaterialCategoryDTO.class, mapper.listByParentCategory(categoryId));
public List<MaterialCategoryDTO> listByParentCategory(String wxEnterpriseId , String categoryId) {
return EntityUtil.changeEntityListByJSON(MaterialCategoryDTO.class, mapper.listByParentCategory(wxEnterpriseId , categoryId));
}
@Override
public void materialSortCategory(MaterialCategorySortQDTO qdto) {
String categoryId = qdto.getCategoryId();
Integer sortNum = qdto.getSortNum();
MaterialCategoryDTO dto = this.selectMaterialCategoryById(categoryId) ;
String parentId = dto.getCategoryParentId();
List<MaterialCategoryDTO> list = EntityUtil.changeEntityListByJSON(MaterialCategoryDTO.class, mapper.listByParentCategory(dto.getWxEnterpriseId() , parentId));
int oldSortNum = 0 ;
for(int i=0;i<list.size();i++) {
MaterialCategoryDTO item = list.get(i) ;
if(item.getCategoryId().equals(categoryId)) {
oldSortNum = i+1 ;
}
}
int index = 1 ;
int maxIndex = sortNum + 1 ;
if(CollectionUtils.isNotEmpty(list)) {
for (int i=0;i<list.size();i++) {
int x = i+1 ;
MaterialCategoryDTO item = list.get(i) ;
if(item.getCategoryId().equals(categoryId)) {
item.setSortNum(sortNum);
continue;
}
// 往后排
if(sortNum > oldSortNum) {
if(x > sortNum) {
item.setSortNum(maxIndex);
maxIndex++ ;
}else {
item.setSortNum(index);
index++ ;
}
continue;
}
// 往前排
if(x >= sortNum) {
item.setSortNum(maxIndex);
maxIndex++ ;
}else {
item.setSortNum(index);
index++ ;
}
}
}
this.mapper.updateSortNum(list) ;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java
......@@ -149,7 +149,7 @@ public class MaterialServiceImpl implements MaterialService {
Integer materialType = materialDTO.getMaterialType();
String madiaId = materialDTO.getMediaId();
//需要上传的类型
List<Integer> typeList = Arrays.asList(2, 4, 5, 6 , 7);
List<Integer> typeList = Arrays.asList(2, 3, 4, 5, 6 , 7);
if (typeList.contains(materialType)) {
madiaId = this.reUpdalodMetail(materialId,from);
}
......@@ -202,6 +202,10 @@ public class MaterialServiceImpl implements MaterialService {
fileType = QywxMediaTypeEnum.IMAGE;
url = old.getImgUrl();
}
if (type ==3) {
fileType = QywxMediaTypeEnum.IMAGE;
url = old.getImgUrl();
}
if (type == 4) {
fileType = QywxMediaTypeEnum.VIDEO;
url = old.getLink();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java
......@@ -230,8 +230,12 @@ public class QywxSendServiceImpl implements QywxSendService {
QywxLinkMaterialDTO linkMaterialDTO = new QywxLinkMaterialDTO();
linkMaterialDTO.setTitle(material.getMaterialTitle());
linkMaterialDTO.setPicUrl(material.getWxImgUrl());
if(StringUtils.isNotBlank(linkMaterialDTO.getPicUrl())) {
linkMaterialDTO.setPicUrl(material.getImgUrl());
}
linkMaterialDTO.setDesc(material.getMaterialDesc());
linkMaterialDTO.setUrl(material.getLink());
linkMaterialDTO.setMedia_id(maerialId);
dto.setMsgType(QywxMediaTypeEnum.LINK.getName());
dto.setLink(linkMaterialDTO);
} else if (materialType == 4) {
......@@ -259,7 +263,7 @@ public class QywxSendServiceImpl implements QywxSendService {
//Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCodeWithChannelAndSceneOfNotUrl(en.getEnterpriseId(),str,canvasId+"","canvas",nodeId+"_"+execLogId+"_"+clerkTaskTime+"_"+clerkId) ;
path = this.enterpriseWxaLinkService.getLinkForCanvas(en.getEnterpriseId(),str,canvasId,nodeId,execLogId,new Date(clerkTaskTime),clerkId) ;
}
if(StringUtils.isNotBlank(material.getLink()) && material.getLink().startsWith("{")) {
if(StringUtils.isNotBlank(material.getLink()) && material.getLink().startsWith("{") && null != canvasId) {
EnterpriseWxaRelationDTO en = this.enterpriseService.getByWxappkey(material.getAppId()) ;
path = this.enterpriseWxaLinkService.getLinkForCanvas(en.getEnterpriseId(),material.getLink(),canvasId,nodeId,execLogId,new Date(clerkTaskTime),clerkId) ;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/SecretSettingServiceImpl.java
......@@ -77,7 +77,7 @@ public class SecretSettingServiceImpl implements SecretSettingService {
return null;
}
// 如果是纯自建,使用自建的token
if(qwDTO.isSelf()) {
if(qwDTO.isSelf() && StringUtils.isNotBlank(qwDTO.getUrlHost())) {
secretType = SecretTypeEnum.SELF_APP.getVal() ;
}
TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
......@@ -215,7 +215,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
if(delFlag) {
this.mapper.changeStatusByClerkId(oldClerkId, 0);
}
if(StringUtils.isNotBlank(newClerkId)) {
List<String> memberIdList = this.externalClerkRelatedMapper.listByClerkId(staffId, oldClerkId) ;
this.externalClerkRelatedService.updateClerkInfo(staffId , oldClerkId , newClerkId) ;
......@@ -357,6 +357,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
if (clerkDTO != null) {
dto.setClerkType(clerkDTO.getClerkType());
}
if(clerkDTO.getClerkType()==2) {
logger.info("设置区经标识={}",dto.getClerkId());
dto.setManageFlag(1);
}
String staffClerkRelationId = insert(dto);
if (StringUtils.isNotBlank(staffClerkRelationId)) {
String wxEnterpriseId = dto.getWxEnterpriseId();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeSendServiceImpl.java
......@@ -161,7 +161,7 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
welcomeBO = welcomeService.getMatchWelcome(staffId, wxEnterpriseId,welcomeScene);
}
if (Objects.isNull(welcomeBO)) {
log.info("欢迎语未配置wxEnterpriseId:{}", wxEnterpriseId);
log.info("活码欢迎语未配置wxEnterpriseId:{}", wxEnterpriseId);
return;
}
// 内容
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java
......@@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map;
import cn.hutool.core.collection.CollUtil;
import com.gic.redis.data.util.RedisUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
......@@ -52,6 +53,16 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
@Override
public String add(WxEnterpriseDTO wxDTO) {
String wxCorpid = wxDTO.getWxCorpid() ;
if(StringUtils.isBlank(wxCorpid)) {
wxCorpid = wxDTO.getOpenCorpid() ;
}
String key = "wxEnterpriseId:"+wxCorpid ;
RedisUtil.lock(key,3L);
TabHaobanWxEnterprise en = this.getEnterpriseBycorpId(wxCorpid);
if(null != en) {
return en.getWxEnterpriseId() ;
}
logger.info("新增wx_enterprise,dto={}",JSON.toJSONString(wxDTO));
Date now = new Date();
wxDTO.setWxEnterpriseId(StringUtil.randomUUID());
......@@ -61,6 +72,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
tabHaobanWxEnterprise.setStatusFlag(1);
tabHaobanWxEnterprise.setBindFlag(1);
mapper.insertSelective(tabHaobanWxEnterprise);
RedisUtil.unlock(key);
return wxDTO.getWxEnterpriseId();
}
......@@ -119,8 +131,27 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
}
qw.setSelfAppid(wxEnterprise.getWxaAppid());
}
qw.setHbWxaAppid(this.getHbAppid(qw, config.getAppid()));
qw.setSelf3thSecret(this.getSecret(qw, config.getWxSuiteid()));
// 只使用代开发（用于从自建转代开发）
if(qw.getWxSecurityType()==6) {
qw.setUrlHost(null);
qw.setDkCorpid(wxEnterprise.getWxCorpid());
qw.setThirdCorpid(wxEnterprise.getWxCorpid());
qw.setMemberCorpid(wxEnterprise.getWxCorpid());
TabSecretSetting secret = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal(), null);
if(null != secret) {
qw.setSelfSecret(secret.getSecretVal());
qw.setSelf3thSecret(secret.getSecretVal());
}
qw.setSelfAppid(wxEnterprise.getWxaAppid());
TabHaobanWxApplication app = this.wxApplicationMapper.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,3) ;
if(null != app) {
qw.setAgentId(app.getAgentId());
qw.setAgentName(app.getAgentName());
}
}
qw.setHbWxaAppid(this.getHbAppid(qw, config.getAppid()));
logger.info("企微所有corpid信息={}",JSON.toJSON(qw));
return qw;
}
......
haoban-manage3-service/src/test/java/QwOpenTest.java
This source diff could not be displayed because it is too large. You can view the blob instead.
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