Skip to content

H
haoban-manage3.0
Commit 7f9fe7ec by 徐高华
Options

删除好友表的wx_user_id

parent f1869650
Showing with 142 additions and 468 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ExternalClerkRelatedDTO.java
...@@ -30,8 +30,6 @@ public class ExternalClerkRelatedDTO implements Serializable { ...@@ -30,8 +30,6 @@ public class ExternalClerkRelatedDTO implements Serializable {
private String staffId; private String staffId;
private String wxUserId;
private Integer statusFlag; private Integer statusFlag;
private String relationKey; private String relationKey;
...@@ -146,14 +144,6 @@ public class ExternalClerkRelatedDTO implements Serializable { ...@@ -146,14 +144,6 @@ public class ExternalClerkRelatedDTO implements Serializable {
this.staffId = staffId == null ? null : staffId.trim(); this.staffId = staffId == null ? null : staffId.trim();
} }
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public Integer getStatusFlag() { public Integer getStatusFlag() {
return statusFlag; return statusFlag;
} }
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MemberUnionidRelatedDTO.java
...@@ -45,6 +45,15 @@ public class MemberUnionidRelatedDTO implements Serializable{ ...@@ -45,6 +45,15 @@ public class MemberUnionidRelatedDTO implements Serializable{
*/ */
private String state; private String state;
private String staffId ;
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getWelcomeCode() { public String getWelcomeCode() {
return welcomeCode; return welcomeCode;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
...@@ -19,16 +19,6 @@ import java.util.Map; ...@@ -19,16 +19,6 @@ import java.util.Map;
public interface ExternalClerkRelatedApiService { public interface ExternalClerkRelatedApiService {
/** /**
* 查询导购好友关联
*
* @param wxUserId : 微信用户id
* @param wxEnterpriseId : 微信企业id
* @param enterpriseId : 企业id
* @return : 返回好友关联
*/
List<ExternalClerkRelatedDTO> listByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId, String enterpriseId);
/**
* 查询会员在企业下的好友关系 * 查询会员在企业下的好友关系
* *
* @param memberId : 会员id * @param memberId : 会员id
...@@ -42,12 +32,12 @@ public interface ExternalClerkRelatedApiService { ...@@ -42,12 +32,12 @@ public interface ExternalClerkRelatedApiService {
List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date); List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
@Deprecated @Deprecated
Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds, Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> staffIdList, List<String> sendMemberIds,
String enterpriseId, BasePageInfo pageInfo); String enterpriseId, BasePageInfo pageInfo);
List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String wxUserId, String wxEnterpriseId); List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String staffId, String wxEnterpriseId);
List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> userIdList, String wxEnterpriseId); List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> staffIdList, String wxEnterpriseId);
/** /**
* 根据关联key查询待关联的记录-触达待完善记录 * 根据关联key查询待关联的记录-触达待完善记录
...@@ -107,7 +97,7 @@ public interface ExternalClerkRelatedApiService { ...@@ -107,7 +97,7 @@ public interface ExternalClerkRelatedApiService {
* *
* @return * @return
*/ */
ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId); ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String staffId, String enterpriseId, String externalUserId);
/** /**
* 根据id查询列表 * 根据id查询列表
...@@ -234,7 +224,7 @@ public interface ExternalClerkRelatedApiService { ...@@ -234,7 +224,7 @@ public interface ExternalClerkRelatedApiService {
* @param clerkId * @param clerkId
* @return * @return
*/ */
int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String wxUserId, String clerkId); int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String staffId, String clerkId);
/** /**
...@@ -269,7 +259,7 @@ public interface ExternalClerkRelatedApiService { ...@@ -269,7 +259,7 @@ public interface ExternalClerkRelatedApiService {
* @author mozhu * @author mozhu
* @date 2022-03-11 15:23:13 * @date 2022-03-11 15:23:13
*/ */
ExternalClerkRelatedDTO getByWxEnterpriseIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid); ExternalClerkRelatedDTO getByWxEnterpriseIdAndUnionId(String wxEnterpriseId, String staffId, String unionid);
/** /**
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java
...@@ -18,9 +18,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -18,9 +18,7 @@ public interface MemberUnionidRelatedApiService {
* @param memberId : 会员id * @param memberId : 会员id
* @return : 返回导购与会员关联关系 * @return : 返回导购与会员关联关系
*/ */
ExternalClerkRelatedDTO getByWxUserIdMemberId(String wxUserId, String memberId); ExternalClerkRelatedDTO getByWxUserIdMemberId(String staffId, String memberId);
MemberUnionidRelatedDTO getByUnionId(String staffId, String unionid);
/** /**
* 外部联系人新增（加好友） * 外部联系人新增（加好友）
...@@ -54,10 +52,6 @@ public interface MemberUnionidRelatedApiService { ...@@ -54,10 +52,6 @@ public interface MemberUnionidRelatedApiService {
ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId); ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId);
List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
/** /**
* 查看是否可以跳转会员详情的会员列表 * 查看是否可以跳转会员详情的会员列表
* *
...@@ -70,9 +64,6 @@ public interface MemberUnionidRelatedApiService { ...@@ -70,9 +64,6 @@ public interface MemberUnionidRelatedApiService {
void cleanByCid(String cid); void cleanByCid(String cid);
Page<MemberUnionidRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
String enterpriseId, BasePageInfo pageInfo);
/** /**
* 群发助手发送企业微信消息 * 群发助手发送企业微信消息
* *
...@@ -120,8 +111,6 @@ public interface MemberUnionidRelatedApiService { ...@@ -120,8 +111,6 @@ public interface MemberUnionidRelatedApiService {
JSONResponse getMessageStatus(String wxEnterpriseId, String wxMessageId); JSONResponse getMessageStatus(String wxEnterpriseId, String wxMessageId);
List<MemberUnionidRelatedDTO> getByWxUserIdListAndWxEnterpriseId(List<String> userIdList, String wxEnterpriseId);
/** /**
* 添加好友 * 添加好友
* *
...@@ -193,7 +182,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -193,7 +182,7 @@ public interface MemberUnionidRelatedApiService {
* @param wxUserId * @param wxUserId
* @param externalUserIds * @param externalUserIds
*/ */
void cleanNoExsitFriendNew(String wxEnterpriseId, String wxUserId, List<String> externalUserIds); void cleanNoExsitFriendNew(String wxEnterpriseId, String staffId, List<String> externalUserIds);
/** /**
* 根据会员的unionid 获取好友导购列表 * 根据会员的unionid 获取好友导购列表
...@@ -204,16 +193,6 @@ public interface MemberUnionidRelatedApiService { ...@@ -204,16 +193,6 @@ public interface MemberUnionidRelatedApiService {
*/ */
ServiceResponse<List<FriendStoreInfoDTO>> listFriendClerkByMemberUnionid(String enterpriseId, String unionId); ServiceResponse<List<FriendStoreInfoDTO>> listFriendClerkByMemberUnionid(String enterpriseId, String unionId);
/**
* 根据企业内部外部联系人id 获取关联关系
*
* @param wxEnterpriseId
* @param wxUserId
* @param selfExternalUserId
* @return
*/
MemberUnionidRelatedDTO getExternalUseridInfoBySelfExternalUserId(String wxEnterpriseId, String wxUserId, String selfExternalUserId);
/** /**
* 根据企业内部外部联系人id 获取关联关系 * 根据企业内部外部联系人id 获取关联关系
...@@ -250,19 +229,6 @@ public interface MemberUnionidRelatedApiService { ...@@ -250,19 +229,6 @@ public interface MemberUnionidRelatedApiService {
/** /**
* 根据unionid查询导购好友
*
* @param wxEnterpriseId wx企业标识
* @param wxUserId wx用户id
* @param unionid unionid
* @return {@link MemberUnionidRelatedDTO }
* @author mozhu
* @date 2022-03-11 15:41:09
*/
MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid);
/**
* 根据id查询 * 根据id查询
* *
* @param memberUnionidRelatedId 成员unionid相关id * @param memberUnionidRelatedId 成员unionid相关id
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
...@@ -90,7 +90,7 @@ public interface StaffApiService { ...@@ -90,7 +90,7 @@ public interface StaffApiService {
void wxFristAdd(String userJson, String wxEnterpriseId); void wxFristAdd(String userJson, String wxEnterpriseId);
List<String> listBindClerkUserId(String storeId); List<String> listBindStaffId(String storeId);
List<StaffClerkRelationDTO> listBindRelationUserId(String storeId); List<StaffClerkRelationDTO> listBindRelationUserId(String storeId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java
package com.gic.haoban.manage.service.dao.mapper; package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.MemberUnionidRelated; import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
public interface MemberUnionidRelatedMapper { public interface MemberUnionidRelatedMapper {
int deleteByPrimaryKey(String memberUnionidRelatedId);
int insert(MemberUnionidRelated record); int insert(MemberUnionidRelated record);
...@@ -19,28 +17,14 @@ public interface MemberUnionidRelatedMapper { ...@@ -19,28 +17,14 @@ public interface MemberUnionidRelatedMapper {
int cleanByCid(@Param("cid") String cid); int cleanByCid(@Param("cid") String cid);
MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId, @Param("unionid") String unionid); MemberUnionidRelated getByUnionId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffId") String staffId, @Param("unionid") String unionid);
MemberUnionidRelated getByMemberId(@Param("wxUserId") String wxUserId, @Param("memberId") String memberId); void deleteByUnionidAndUserId(@Param("externalUserid") String externalUserid, @Param("staffId") String staffId);
void deleteByUnionidAndUserId(@Param("externalUserid") String externalUserid, @Param("wxUserId") String wxUserId); void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("staffId") String staffId);
void delMemberUnionidRelatedBatch(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserids") List<String> externalUserid, @Param("wxUserId") String wxUserId);
List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId);
List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId") String enterpriseId, @Param("date") Date date); List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId") String enterpriseId, @Param("date") Date date);
MemberUnionidRelated getByParams(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId,
@Param("externalName") String name, @Param("addCreateTime") String createTime);
List<MemberUnionidRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid") String externalUserid, @Param("wxUserId") String wxUserId);
Page<MemberUnionidRelated> pageMemberUnionByParams(@Param("userIdList") List<String> userIdList, @Param("sendMemberIds") List<String> sendMemberIds,
@Param("enterpriseId") String enterpriseId);
List<MemberUnionidRelated> getByWxUserIdListAndWxEnterpriseId(@Param("userIdList") List<String> userIdList, @Param("wxEnterpriseId") String wxEnterpriseId);
void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds); void cleanStaffRelated(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
/** /**
...@@ -51,9 +35,9 @@ public interface MemberUnionidRelatedMapper { ...@@ -51,9 +35,9 @@ public interface MemberUnionidRelatedMapper {
* @param selfExternalUserId * @param selfExternalUserId
* @return * @return
*/ */
MemberUnionidRelated getBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId); MemberUnionidRelated getBySelfExternalUserId(@Param("staffId") String staffId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
List<MemberUnionidRelated> listBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId); List<MemberUnionidRelated> listBySelfExternalUserId(@Param("staffId") String staffId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
/** /**
* 更新外部用户id的老外部用户id * 更新外部用户id的老外部用户id
...@@ -70,30 +54,6 @@ public interface MemberUnionidRelatedMapper { ...@@ -70,30 +54,6 @@ public interface MemberUnionidRelatedMapper {
@Param("wxEnterpriseId") String wxEnterpriseId); @Param("wxEnterpriseId") String wxEnterpriseId);
/** /**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:32:46
*/
int updateUserIdByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
/**
* 更新自建外部用户id
*
* @param new_external_userid 新外部标识
* @param external_userid 外部用户标识
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:35:21
*/
int updateSelfExternalUserIdByOldSelfExternalUserId(@Param("newExternalUserId") String new_external_userid,
@Param("oldExternalUserId") String external_userid,
@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* wx企业id查询数据 * wx企业id查询数据
* *
* @param wxEnterpriseId wx企业标识 * @param wxEnterpriseId wx企业标识
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/MemberUnionidRelated.java
...@@ -18,8 +18,6 @@ public class MemberUnionidRelated implements Serializable { ...@@ -18,8 +18,6 @@ public class MemberUnionidRelated implements Serializable {
private String externalUserid; private String externalUserid;
private String wxUserId;
private Date createTime; private Date createTime;
private Date updateTime; private Date updateTime;
...@@ -30,8 +28,18 @@ public class MemberUnionidRelated implements Serializable { ...@@ -30,8 +28,18 @@ public class MemberUnionidRelated implements Serializable {
private String addCreateTime; private String addCreateTime;
private String staffId ;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getMemberUnionidRelatedId() { public String getMemberUnionidRelatedId() {
return memberUnionidRelatedId; return memberUnionidRelatedId;
} }
...@@ -80,14 +88,6 @@ public class MemberUnionidRelated implements Serializable { ...@@ -80,14 +88,6 @@ public class MemberUnionidRelated implements Serializable {
this.externalUserid = externalUserid == null ? null : externalUserid.trim(); this.externalUserid = externalUserid == null ? null : externalUserid.trim();
} }
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanExternalClerkRelated.java
...@@ -29,8 +29,6 @@ public class TabHaobanExternalClerkRelated implements Serializable { ...@@ -29,8 +29,6 @@ public class TabHaobanExternalClerkRelated implements Serializable {
private String clerkId; private String clerkId;
private String staffId; private String staffId;
private String wxUserId;
/** /**
* 触达次数 * 触达次数
*/ */
...@@ -160,14 +158,6 @@ public class TabHaobanExternalClerkRelated implements Serializable { ...@@ -160,14 +158,6 @@ public class TabHaobanExternalClerkRelated implements Serializable {
this.staffId = staffId == null ? null : staffId.trim(); this.staffId = staffId == null ? null : staffId.trim();
} }
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public Integer getStatusFlag() { public Integer getStatusFlag() {
return statusFlag; return statusFlag;
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/mq/processor/AddMemberUnionRelateConsumerProcessor.java
...@@ -120,7 +120,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce ...@@ -120,7 +120,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
String externalUserid = qywxUserApiService.toServiceExternalUserid(bo.getCorpid(), bo.getSecret(), selfExternalUserid); String externalUserid = qywxUserApiService.toServiceExternalUserid(bo.getCorpid(), bo.getSecret(), selfExternalUserid);
logger.info("自建转换第三方返回:{}", externalUserid); logger.info("自建转换第三方返回:{}", externalUserid);
// 幂等 // 幂等
MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByWxUserIdAndUnionId(wxEnterpriseId, wxUserId, dto.getUnionid()); MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByWxUserIdAndUnionId(wxEnterpriseId, staffId, dto.getUnionid());
String memberUnionIdRelatedId; String memberUnionIdRelatedId;
if (Objects.isNull(exsitDTO)) { if (Objects.isNull(exsitDTO)) {
dto.setMemberId(memberId); dto.setMemberId(memberId);
...@@ -144,7 +144,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce ...@@ -144,7 +144,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
return; return;
} }
// 幂等 // 幂等
TabHaobanExternalClerkRelated external = externalClerkRelatedService.getByParams(wxUserId, wxEnterpriseId, dto.getExternalName(), addCreateTime); TabHaobanExternalClerkRelated external = externalClerkRelatedService.getByParams(staffId, wxEnterpriseId, dto.getExternalName(), addCreateTime);
String relationKey = SecureUtil.md5(staffId + selfExternalUserid); String relationKey = SecureUtil.md5(staffId + selfExternalUserid);
if (external != null) { if (external != null) {
logger.info("已经存在好友关系"); logger.info("已经存在好友关系");
...@@ -177,7 +177,6 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce ...@@ -177,7 +177,6 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
related.setRelationKey(relationKey); related.setRelationKey(relationKey);
related.setUnionid(unionid); related.setUnionid(unionid);
related.setWxEnterpriseId(wxEnterpriseId); related.setWxEnterpriseId(wxEnterpriseId);
related.setWxUserId(wxUserId);
related.setMemberId(memberId); related.setMemberId(memberId);
related.setStatusFlag(1); related.setStatusFlag(1);
externalClerkRelatedService.insert(related); externalClerkRelatedService.insert(related);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/ExternalClerkRelatedService.java
...@@ -24,7 +24,7 @@ public interface ExternalClerkRelatedService { ...@@ -24,7 +24,7 @@ public interface ExternalClerkRelatedService {
* @param wxUserId * @param wxUserId
* @param externalUserids * @param externalUserids
*/ */
void delByUserIdAndExternalUserIdBatch(String wxEnterpriseId, String wxUserId, List<String> externalUserids); void delByUserIdAndExternalUserIdBatch(String wxEnterpriseId, String staffId, List<String> externalUserids);
void delByClerkIdAndStaffId(String clerkId, String staffId); void delByClerkIdAndStaffId(String clerkId, String staffId);
...@@ -36,13 +36,13 @@ public interface ExternalClerkRelatedService { ...@@ -36,13 +36,13 @@ public interface ExternalClerkRelatedService {
void update(TabHaobanExternalClerkRelated exsitDTO); void update(TabHaobanExternalClerkRelated exsitDTO);
TabHaobanExternalClerkRelated getByParams(String userId, String wxEnterpriseId, String name, String createTime); TabHaobanExternalClerkRelated getByParams(String staffId, String wxEnterpriseId, String name, String createTime);
List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId); List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String wxUserId); List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String wxUserId);
ExternalClerkRelatedDTO getByMemberId(String wxUserId, String memberId); ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId);
/** /**
* 根据unionid获取外部联系人的绑定导购 * 根据unionid获取外部联系人的绑定导购
...@@ -71,13 +71,4 @@ public interface ExternalClerkRelatedService { ...@@ -71,13 +71,4 @@ public interface ExternalClerkRelatedService {
*/ */
String checkAndUpdateMemberByUnonId(String enterpriseId, String memberId, String unionId); String checkAndUpdateMemberByUnonId(String enterpriseId, String memberId, String unionId);
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:35:47
*/
int updateUserIdByWxEnterpriseId(String wxEnterpriseId);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MemberUnionRelatedService.java
...@@ -10,9 +10,7 @@ import java.util.List; ...@@ -10,9 +10,7 @@ import java.util.List;
public interface MemberUnionRelatedService { public interface MemberUnionRelatedService {
MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid); MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String staffId, String unionid);
MemberUnionidRelatedDTO getByMemberId(String wxUserId, String memberId);
String addMemberUnionidRelated(MemberUnionidRelatedDTO dto); String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
...@@ -25,18 +23,12 @@ public interface MemberUnionRelatedService { ...@@ -25,18 +23,12 @@ public interface MemberUnionRelatedService {
* @param wxUserId * @param wxUserId
* @param externalUserids * @param externalUserids
*/ */
void delMemberUnionidRelatedBatch(String wxEnterpriseId, String wxUserId, List<String> externalUserids); void delMemberUnionidRelatedBatch(String wxEnterpriseId, String staffId, List<String> externalUserids);
List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
MemberUnionidRelatedDTO getByParams(String wxUserId, String enterpriseId, String name, String createTime);
void update(MemberUnionidRelatedDTO exsitDTO); void update(MemberUnionidRelatedDTO exsitDTO);
void clean(String cid); void clean(String cid);
com.github.pagehelper.Page<MemberUnionidRelated> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
String enterpriseId);
void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds); void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds);
...@@ -48,7 +40,7 @@ public interface MemberUnionRelatedService { ...@@ -48,7 +40,7 @@ public interface MemberUnionRelatedService {
* @param selfExternalUserId * @param selfExternalUserId
* @return * @return
*/ */
MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId); MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId);
/** /**
...@@ -70,17 +62,7 @@ public interface MemberUnionRelatedService { ...@@ -70,17 +62,7 @@ public interface MemberUnionRelatedService {
* @param selfExternalUserId * @param selfExternalUserId
* @return * @return
*/ */
List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId); List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId);
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:32:21
*/
int updateUserIdByWxEnterpriseId(String wxEnterpriseId);
/** /**
* 更新外部userid wx企业id * 更新外部userid wx企业id
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
...@@ -75,9 +75,10 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -75,9 +75,10 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
logger.error("无需删除的好友数据：{}", JSON.toJSONString(dto)); logger.error("无需删除的好友数据：{}", JSON.toJSONString(dto));
return; return;
} }
String staffId = dto.getStaffId() ;
String wxUserId = dto.getWxUserId(); String wxUserId = dto.getWxUserId();
String externalUserid = dto.getExternalUserid(); String externalUserid = dto.getExternalUserid();
List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, 2); List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, staffId, 2);
if (CollectionUtils.isEmpty(tabHaobanExternalClerkRelatedList)) { if (CollectionUtils.isEmpty(tabHaobanExternalClerkRelatedList)) {
logger.info("无解除的好友关系：externalUserid:{},wxUserId:{}", externalUserid, wxUserId); logger.info("无解除的好友关系：externalUserid:{},wxUserId:{}", externalUserid, wxUserId);
return; return;
...@@ -90,7 +91,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -90,7 +91,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
return; return;
} }
String staffId = tabHaobanStaff.getStaffId(); staffId = tabHaobanStaff.getStaffId();
List<TabHaobanStaffClerkRelation> tabHaobanStaffClerkRelations = staffClerkRelationMapper.lisByStaffId(wxEnterpriseId, staffId,null); List<TabHaobanStaffClerkRelation> tabHaobanStaffClerkRelations = staffClerkRelationMapper.lisByStaffId(wxEnterpriseId, staffId,null);
if (CollectionUtils.isEmpty(tabHaobanStaffClerkRelations)) { if (CollectionUtils.isEmpty(tabHaobanStaffClerkRelations)) {
logger.error("找不到员工导购关联关系:staffId:{}，wxEnterpriseId：{}", staffId, wxEnterpriseId); logger.error("找不到员工导购关联关系:staffId:{}，wxEnterpriseId：{}", staffId, wxEnterpriseId);
...@@ -132,8 +133,8 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -132,8 +133,8 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
} }
@Override @Override
public void delByUserIdAndExternalUserIdBatch(String wxEnterpriseId, String wxUserId, List<String> externalUserids) { public void delByUserIdAndExternalUserIdBatch(String wxEnterpriseId, String staffId, List<String> externalUserids) {
mapper.delByUserIdAndExternalUserIdBatch(wxUserId, wxEnterpriseId, externalUserids); mapper.delByUserIdAndExternalUserIdBatch(staffId, wxEnterpriseId, externalUserids);
} }
@Override @Override
...@@ -167,9 +168,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -167,9 +168,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
} }
@Override @Override
public TabHaobanExternalClerkRelated getByParams(String userId, String wxEnterpriseId, String name, public TabHaobanExternalClerkRelated getByParams(String staffId, String wxEnterpriseId, String name,
String createTime) { String createTime) {
return mapper.getByParams(userId, wxEnterpriseId, name, createTime); return mapper.getByParams(staffId, wxEnterpriseId, name, createTime);
} }
@Override @Override
...@@ -178,13 +179,13 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -178,13 +179,13 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
} }
@Override @Override
public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String wxUserId) { public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String staffId) {
return mapper.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserid, wxUserId); return mapper.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserid, staffId);
} }
@Override @Override
public ExternalClerkRelatedDTO getByMemberId(String wxUserId, String memberId) { public ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId) {
return EntityUtil.changeEntityByJSON(ExternalClerkRelatedDTO.class, mapper.getByMemberId(wxUserId, memberId)); return EntityUtil.changeEntityByJSON(ExternalClerkRelatedDTO.class, mapper.getByMemberId(staffId, memberId));
} }
@Override @Override
...@@ -229,9 +230,4 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -229,9 +230,4 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
} }
return null; return null;
} }
@Override
public int updateUserIdByWxEnterpriseId(String wxEnterpriseId) {
return mapper.updateUserIdByWxEnterpriseId(wxEnterpriseId);
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/HandoverServiceImpl.java
...@@ -224,7 +224,7 @@ public class HandoverServiceImpl implements HandoverService { ...@@ -224,7 +224,7 @@ public class HandoverServiceImpl implements HandoverService {
mid.setExternalUserId(infoDTO.getExternalUserid()); mid.setExternalUserId(infoDTO.getExternalUserid());
mid.setWxEnterpriseId(wxEnterpriseId); mid.setWxEnterpriseId(wxEnterpriseId);
mid.setHaobanFriendFlag(0); mid.setHaobanFriendFlag(0);
TabHaobanExternalClerkRelated externalClerkRelated = externalClerkRelatedMapper.getLastByExTernalUseridAndWxUserIdNoStatus(wxEnterpriseId, infoDTO.getExternalUserid(), infoDTO.getHandoverUserid()); TabHaobanExternalClerkRelated externalClerkRelated = externalClerkRelatedMapper.getLastByExTernalUseridAndWxUserIdNoStatus(wxEnterpriseId, infoDTO.getExternalUserid(), handoverStaff.getStaffId());
if (null == externalClerkRelated) { if (null == externalClerkRelated) {
mid.setExternalUserName("企业微信客户"); mid.setExternalUserName("企业微信客户");
mid.setRelationId("-1"); mid.setRelationId("-1");
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MemberUnionRelatedServiceImpl.java
...@@ -23,13 +23,10 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService ...@@ -23,13 +23,10 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
private MemberUnionidRelatedMapper mapper; private MemberUnionidRelatedMapper mapper;
@Override @Override
public MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid) { public MemberUnionidRelatedDTO getByWxUserIdAndUnionId(String wxEnterpriseId, String staffId, String unionid) {
return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class, mapper.getByUnionId(wxEnterpriseId, wxUserId, unionid)); return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class, mapper.getByUnionId(wxEnterpriseId, staffId, unionid));
}
@Override
public MemberUnionidRelatedDTO getByMemberId(String wxUserId, String memberId) {
return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class,mapper.getByMemberId(wxUserId,memberId));
} }
@Override @Override
public String addMemberUnionidRelated(MemberUnionidRelatedDTO dto) { public String addMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
dto.setStatusFlag(1); dto.setStatusFlag(1);
...@@ -42,22 +39,13 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService ...@@ -42,22 +39,13 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
@Override @Override
public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto) { public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
mapper.deleteByUnionidAndUserId(dto.getExternalUserid(),dto.getWxUserId()); String staffId = null ;
} mapper.deleteByUnionidAndUserId(dto.getExternalUserid(),staffId);
@Override
public void delMemberUnionidRelatedBatch(String wxEnterpriseId, String wxUserId, List<String> externalUserids) {
mapper.delMemberUnionidRelatedBatch(wxEnterpriseId, externalUserids, wxUserId);
}
@Override
public List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId) {
return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class, mapper.getByWxUserIdAndWxEnterpriseId(wxUserId,wxEnterpriseId));
} }
@Override @Override
public MemberUnionidRelatedDTO getByParams(String wxUserId, String wxEnterpriseId, String name, String createTime) { public void delMemberUnionidRelatedBatch(String wxEnterpriseId, String staffId, List<String> externalUserids) {
return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class,mapper.getByParams(wxUserId,wxEnterpriseId,name,createTime)); mapper.delMemberUnionidRelatedBatch(wxEnterpriseId, externalUserids, staffId);
} }
@Override @Override
...@@ -72,11 +60,6 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService ...@@ -72,11 +60,6 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
} }
@Override @Override
public Page<MemberUnionidRelated> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
String enterpriseId) {
return mapper.pageMemberUnionByParams(userIdList,sendMemberIds,enterpriseId);
}
@Override
public void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds) { public void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds) {
if(staffIds == null || staffIds.isEmpty()){ if(staffIds == null || staffIds.isEmpty()){
return; return;
...@@ -86,8 +69,8 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService ...@@ -86,8 +69,8 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
} }
@Override @Override
public MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) { public MemberUnionidRelatedDTO getByWxUserIdAndSelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId) {
MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(wxUserId,wxEnterpriseId, selfExternalUserId); MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(staffId,wxEnterpriseId, selfExternalUserId);
return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated); return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
} }
...@@ -98,17 +81,12 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService ...@@ -98,17 +81,12 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
} }
@Override @Override
public List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) { public List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String staffId, String wxEnterpriseId, String selfExternalUserId) {
List<MemberUnionidRelated> retList = mapper.listBySelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId); List<MemberUnionidRelated> retList = mapper.listBySelfExternalUserId(staffId, wxEnterpriseId, selfExternalUserId);
return EntityUtil.changeEntityListNew(MemberUnionidRelatedDTO.class, retList); return EntityUtil.changeEntityListNew(MemberUnionidRelatedDTO.class, retList);
} }
@Override @Override
public int updateUserIdByWxEnterpriseId(String wxEnterpriseId) {
return mapper.updateUserIdByWxEnterpriseId(wxEnterpriseId);
}
@Override
public int updateExternalUseridByWxEnterpriseId(String wxEnterpriseId) { public int updateExternalUseridByWxEnterpriseId(String wxEnterpriseId) {
return mapper.updateExternalUseridByWxEnterpriseId(wxEnterpriseId); return mapper.updateExternalUseridByWxEnterpriseId(wxEnterpriseId);
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java
...@@ -123,7 +123,7 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic ...@@ -123,7 +123,7 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
messageDTO.setAlertType(AlertTypeEnum.FRIEND_ADD.getType()); messageDTO.setAlertType(AlertTypeEnum.FRIEND_ADD.getType());
messageDTO.setWxEnterpriseId(wxEnterpriseId); messageDTO.setWxEnterpriseId(wxEnterpriseId);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("wxUserid", dto.getWxUserId()); map.put("staffId", dto.getStaffId());
map.put("wxEnterpriseId", wxEnterpriseId); map.put("wxEnterpriseId", wxEnterpriseId);
messageDTO.setContentMap(map); messageDTO.setContentMap(map);
messageDTO.setTraceId(traceId); messageDTO.setTraceId(traceId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java
...@@ -96,20 +96,6 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA ...@@ -96,20 +96,6 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
private WxEnterpriseService wxEnterpriseService ; private WxEnterpriseService wxEnterpriseService ;
/** /**
* 查询导购好友关联
*
* @param wxUserId : 微信用户id
* @param wxEnterpriseId : 微信企业id
* @param enterpriseId : 企业id
* @return : 返回好友关联
*/
@Override
public List<ExternalClerkRelatedDTO> listByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId, String enterpriseId) {
List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId, enterpriseId);
return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, list);
}
/**
* 查询会员在企业下的好友关系 * 查询会员在企业下的好友关系
* *
* @param memberId : 会员id * @param memberId : 会员id
...@@ -131,24 +117,24 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA ...@@ -131,24 +117,24 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
} }
@Override @Override
public Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds, public Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> staffIdList, List<String> sendMemberIds,
String enterpriseId, BasePageInfo pageInfo) { String enterpriseId, BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize()); PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
return PageUtil.changePageHelperToCurrentPage(tabHaobanExternalClerkRelatedMapper.pageMemberUnionByParams(userIdList, sendMemberIds, enterpriseId), ExternalClerkRelatedDTO.class); return PageUtil.changePageHelperToCurrentPage(tabHaobanExternalClerkRelatedMapper.pageMemberUnionByParams(staffIdList, sendMemberIds, enterpriseId), ExternalClerkRelatedDTO.class);
} }
@Override @Override
public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String wxUserId, String wxEnterpriseId) { public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String staffId, String wxEnterpriseId) {
return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserId(wxUserId, wxEnterpriseId)); return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserId(staffId, wxEnterpriseId));
} }
@Override @Override
public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> userIdList, String wxEnterpriseId) { public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> staffIdList, String wxEnterpriseId) {
if (CollectionUtils.isEmpty(userIdList)) { if (CollectionUtils.isEmpty(staffIdList)) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIds(userIdList, wxEnterpriseId)); return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIds(staffIdList, wxEnterpriseId));
} }
@Override @Override
...@@ -158,9 +144,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA ...@@ -158,9 +144,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
} }
@Override @Override
public Page<ExternalClerkRelatedDTO> pageExternalClerk(String wxEnterpriseId, String wxUserId, List<Integer> statusFlags, BasePageInfo pageInfo) { public Page<ExternalClerkRelatedDTO> pageExternalClerk(String wxEnterpriseId, String staffId, List<Integer> statusFlags, BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo); PageHelper.startPage(pageInfo);
List<TabHaobanExternalClerkRelated> ret = tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIdAndStatus(wxEnterpriseId, wxUserId, statusFlags); List<TabHaobanExternalClerkRelated> ret = tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIdAndStatus(wxEnterpriseId, staffId, statusFlags);
Page<ExternalClerkRelatedDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(ret), ExternalClerkRelatedDTO.class); Page<ExternalClerkRelatedDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(ret), ExternalClerkRelatedDTO.class);
return retPage; return retPage;
} }
...@@ -270,8 +256,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA ...@@ -270,8 +256,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
} }
@Override @Override
public ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String wxUserId, String enterpriseId, String externalUserId) { public ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String staffId, String enterpriseId, String externalUserId) {
TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, enterpriseId, externalUserId); TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, staffId, enterpriseId, externalUserId);
return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, externalClerkRelated); return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, externalClerkRelated);
} }
...@@ -502,8 +488,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA ...@@ -502,8 +488,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
} }
@Override @Override
public ExternalClerkRelatedDTO getByWxEnterpriseIdAndUnionId(String wxEnterpriseId, String wxUserId, String unionid) { public ExternalClerkRelatedDTO getByWxEnterpriseIdAndUnionId(String wxEnterpriseId, String staffId, String unionid) {
TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedMapper.getByWxEnterpriseIdAndUnionId(wxEnterpriseId, wxUserId, unionid); TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedMapper.getByWxEnterpriseIdAndUnionId(wxEnterpriseId, staffId, unionid);
return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, related); return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, related);
} }
...@@ -650,7 +636,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA ...@@ -650,7 +636,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
@Override @Override
public int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String wxUserId, String clerkId) { public int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String staffId, String clerkId) {
return tabHaobanExternalClerkRelatedMapper.countByClerkId(wxEnterpriseId, enterpriseId, wxUserId, clerkId); return tabHaobanExternalClerkRelatedMapper.countByClerkId(wxEnterpriseId, enterpriseId, staffId, clerkId);
} }
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
...@@ -678,7 +678,7 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -678,7 +678,7 @@ public class StaffApiServiceImpl implements StaffApiService {
} }
@Override @Override
public List<String> listBindClerkUserId(String storeId) { public List<String> listBindStaffId(String storeId) {
List<String> userIdList = new ArrayList<String>(); List<String> userIdList = new ArrayList<String>();
List<String> storeIds = new ArrayList<String>(); List<String> storeIds = new ArrayList<String>();
storeIds.add(storeId); storeIds.add(storeId);
...@@ -691,7 +691,7 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -691,7 +691,7 @@ public class StaffApiServiceImpl implements StaffApiService {
Set<String> keySet = clerkIdMap.keySet(); Set<String> keySet = clerkIdMap.keySet();
for (String clerkId : clerkList) { for (String clerkId : clerkList) {
if (keySet.contains(clerkId)) { if (keySet.contains(clerkId)) {
userIdList.add(clerkIdMap.get(clerkId).getQwUserId()); userIdList.add(clerkIdMap.get(clerkId).getStaffId());
} }
} }
return userIdList; return userIdList;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendClerkSyncNewOperation.java
...@@ -102,7 +102,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation { ...@@ -102,7 +102,7 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
return; return;
} }
//清理外部联系人 //清理外部联系人
memberUnionidRelatedApiService.cleanNoExsitFriendNew(wxEnterpriseId, wxUserId3th, userIdList); memberUnionidRelatedApiService.cleanNoExsitFriendNew(wxEnterpriseId, staffId, userIdList);
//写入外部联系人的处理队列 //写入外部联系人的处理队列
List<TabHaobanPreDealLog> dealLogList = new ArrayList<>(); List<TabHaobanPreDealLog> dealLogList = new ArrayList<>();
for (String externalUserId : selfUserIdList) { for (String externalUserId : selfUserIdList) {
......
haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/> <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
<result column="status_flag" property="statusFlag" jdbcType="INTEGER"/> <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
<result column="external_userid" property="externalUserid" jdbcType="VARCHAR"/> <result column="external_userid" property="externalUserid" jdbcType="VARCHAR"/>
<result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR"/> <result column="staff_id" property="staffId" jdbcType="VARCHAR"/>
<result column="self_external_userid" property="selfExternalUserid" jdbcType="VARCHAR"/> <result column="self_external_userid" property="selfExternalUserid" jdbcType="VARCHAR"/>
<result column="add_create_time" property="addCreateTime" jdbcType="VARCHAR"/> <result column="add_create_time" property="addCreateTime" jdbcType="VARCHAR"/>
<result column="external_name" property="externalName" jdbcType="VARCHAR"/> <result column="external_name" property="externalName" jdbcType="VARCHAR"/>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
member_unionid_related_id, member_id, unionid, wx_enterprise_id, status_flag, external_userid, member_unionid_related_id, member_id, unionid, wx_enterprise_id, status_flag, external_userid,
wx_user_id, create_time, update_time,add_create_time,self_external_userid,external_name,enterprise_id staff_id, create_time, update_time,add_create_time,self_external_userid,external_name,enterprise_id
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
...@@ -26,20 +26,15 @@ ...@@ -26,20 +26,15 @@
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR} where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete
from tab_haoban_member_unionid_related
where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated"> <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
insert into tab_haoban_member_unionid_related (member_unionid_related_id, member_id, insert into tab_haoban_member_unionid_related (member_unionid_related_id, member_id,
unionid, wx_enterprise_id, status_flag, unionid, wx_enterprise_id, status_flag,
external_userid, wx_user_id, create_time, external_userid, staff_id, create_time,
update_time, add_create_time, self_external_userid, update_time, add_create_time, self_external_userid,
external_name, enterprise_id) external_name, enterprise_id)
values (#{memberUnionidRelatedId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, values (#{memberUnionidRelatedId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
#{unionid,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, #{unionid,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER},
#{externalUserid,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{externalUserid,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{addCreateTime}, #{selfExternalUserid}, #{externalName}, #{updateTime,jdbcType=TIMESTAMP}, #{addCreateTime}, #{selfExternalUserid}, #{externalName},
#{enterpriseId}) #{enterpriseId})
</insert> </insert>
...@@ -65,8 +60,8 @@ ...@@ -65,8 +60,8 @@
<if test="externalUserid != null"> <if test="externalUserid != null">
external_userid = #{externalUserid,jdbcType=VARCHAR}, external_userid = #{externalUserid,jdbcType=VARCHAR},
</if> </if>
<if test="wxUserId != null"> <if test="staffId != null">
wx_user_id = #{wxUserId,jdbcType=VARCHAR}, staff_id = #{staffId,jdbcType=VARCHAR},
</if> </if>
<if test="addCreateTime != null"> <if test="addCreateTime != null">
add_create_time = #{addCreateTime,jdbcType=VARCHAR}, add_create_time = #{addCreateTime,jdbcType=VARCHAR},
...@@ -100,29 +95,19 @@ ...@@ -100,29 +95,19 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId} where staff_id = #{staffId}
and wx_enterprise_id=#{wxEnterpriseId} and wx_enterprise_id=#{wxEnterpriseId}
and status_flag = 1 and status_flag = 1
and unionid = #{unionid} and unionid = #{unionid}
limit 1 limit 1
</select> </select>
<select id="getByMemberId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId}
and status_flag = 1
and member_id = #{memberId}
limit 1
</select>
<update id="deleteByUnionidAndUserId" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated"> <update id="deleteByUnionidAndUserId" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
update tab_haoban_member_unionid_related update tab_haoban_member_unionid_related
set status_flag = 0, set status_flag = 0,
update_time=now() update_time=now()
where external_userid = #{externalUserid,jdbcType=VARCHAR} where external_userid = #{externalUserid,jdbcType=VARCHAR}
and wx_user_id = #{wxUserId} and staff_id = #{staffId}
</update> </update>
<update id="delMemberUnionidRelatedBatch" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated"> <update id="delMemberUnionidRelatedBatch" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
...@@ -130,21 +115,13 @@ ...@@ -130,21 +115,13 @@
set status_flag = 0,update_time=now() set status_flag = 0,update_time=now()
where where
wx_enterprise_id=#{wxEnterpriseId} wx_enterprise_id=#{wxEnterpriseId}
and wx_user_id = #{wxUserId} and staff_id = #{staffId}
and external_userid in and external_userid in
<foreach collection="externalUserids" open="(" close=")" separator="," item="item"> <foreach collection="externalUserids" open="(" close=")" separator="," item="item">
#{item} #{item}
</foreach> </foreach>
</update> </update>
<select id="getByWxUserIdAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId}
and status_flag in(1,3,4)
and wx_enterprise_id = #{wxEnterpriseId}
</select>
<select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
...@@ -156,67 +133,15 @@ ...@@ -156,67 +133,15 @@
</if> </if>
</select> </select>
<select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId}
and status_flag = 1
and external_userid = #{externalUserid}
</select>
<select id="getByParams" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related
where wx_user_id = #{wxUserId}
and status_flag = 1
and wx_enterprise_id = #{wxEnterpriseId}
and external_name = #{externalName}
and add_create_time = #{addCreateTime}
</select>
<select id="pageMemberUnionByParams" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related
where enterprise_id = #{enterpriseId}
and status_flag = 1
and member_id in
<foreach item="memberId" index="index" collection="sendMemberIds" open="(" separator="," close=")">
#{memberId, jdbcType=CHAR}
</foreach>
and wx_user_id in
<foreach item="wxUserId" index="index" collection="userIdList" open="(" separator="," close=")">
#{wxUserId, jdbcType=CHAR}
</foreach>
and member_id is not null
group by external_userid
</select>
<select id="getByWxUserIdListAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_member_unionid_related
where wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1
and wx_user_id in
<foreach item="wxUserId" index="index" collection="userIdList" open="(" separator="," close=")">
#{wxUserId, jdbcType=CHAR}
</foreach>
</select>
<update id="cleanStaffRelated" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated"> <update id="cleanStaffRelated" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated">
update tab_haoban_member_unionid_related update tab_haoban_member_unionid_related
set status_flag = 0, set status_flag = 0,
update_time = now() update_time = now()
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and wx_user_id in and staff_id in
(select wx_user_id from tab_haoban_staff where staff_id in
<foreach collection="staffIds" item="id" index="index" open="(" close=")" separator=","> <foreach collection="staffIds" item="id" index="index" open="(" close=")" separator=",">
#{id,jdbcType=VARCHAR} #{id,jdbcType=VARCHAR}
</foreach> </foreach>
)
and status_flag = 1 and status_flag = 1
</update> </update>
...@@ -227,8 +152,8 @@ ...@@ -227,8 +152,8 @@
where wx_enterprise_id = #{wxEnterpriseId} where wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1 and status_flag = 1
and self_external_userid = #{selfExternalUserId} and self_external_userid = #{selfExternalUserId}
<if test="wxUserId != null"> <if test="staffId != null">
and wx_user_id = #{wxUserId} and staff_id = #{staffId}
</if> </if>
order by create_time desc limit 1 order by create_time desc limit 1
</select> </select>
...@@ -239,7 +164,7 @@ ...@@ -239,7 +164,7 @@
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where wx_enterprise_id = #{wxEnterpriseId} where wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1 and status_flag = 1
and wx_user_id = #{wxUserId} and staff_id = #{staffId}
and self_external_userid = #{selfExternalUserId} and self_external_userid = #{selfExternalUserId}
</select> </select>
...@@ -252,23 +177,6 @@ ...@@ -252,23 +177,6 @@
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
</update> </update>
<update id="updateUserIdByWxEnterpriseId">
UPDATE tab_haoban_member_unionid_related a
LEFT JOIN tab_haoban_external_clerk_related b ON a.member_unionid_related_id = b.member_unionid_related_id
SET a.wx_user_id = b.wx_user_id,a.update_time= now()
WHERE
a.wx_enterprise_id = #{wxEnterpriseId}
AND b.status_flag IN ( 1, 3, 4 )
</update>
<update id="updateSelfExternalUserIdByOldSelfExternalUserId">
UPDATE
tab_haoban_member_unionid_related
SET self_external_userid = #{newExternalUserId},
update_time = now()
where self_external_userid = #{oldExternalUserId}
and wx_enterprise_id = #{wxEnterpriseId}
</update>
<select id="listByWxEnterpriseId" resultMap="BaseResultMap"> <select id="listByWxEnterpriseId" resultMap="BaseResultMap">
select select
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<result column="member_unionid_related_id" property="memberUnionidRelatedId" jdbcType="VARCHAR"/> <result column="member_unionid_related_id" property="memberUnionidRelatedId" jdbcType="VARCHAR"/>
<result column="clerk_id" property="clerkId" jdbcType="VARCHAR"/> <result column="clerk_id" property="clerkId" jdbcType="VARCHAR"/>
<result column="staff_id" property="staffId" jdbcType="VARCHAR"/> <result column="staff_id" property="staffId" jdbcType="VARCHAR"/>
<result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR"/>
<result column="relation_key" property="relationKey" jdbcType="VARCHAR"/> <result column="relation_key" property="relationKey" jdbcType="VARCHAR"/>
<result column="status_flag" property="statusFlag" jdbcType="INTEGER"/> <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
...@@ -25,7 +24,7 @@ ...@@ -25,7 +24,7 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
external_clerk_related_id, wx_enterprise_id, enterprise_id, store_id, member_id, external_clerk_related_id, wx_enterprise_id, enterprise_id, store_id, member_id,
unionid, head_url,external_name, add_create_time, member_unionid_related_id, clerk_id, staff_id, unionid, head_url,external_name, add_create_time, member_unionid_related_id, clerk_id, staff_id,
wx_user_id,relation_key, status_flag, create_time, update_time,external_user_id relation_key, status_flag, create_time, update_time,external_user_id
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
...@@ -77,9 +76,6 @@ ...@@ -77,9 +76,6 @@
<if test="staffId != null"> <if test="staffId != null">
staff_id, staff_id,
</if> </if>
<if test="wxUserId != null">
wx_user_id,
</if>
<if test="pushTimes != null"> <if test="pushTimes != null">
push_times, push_times,
</if> </if>
...@@ -136,9 +132,6 @@ ...@@ -136,9 +132,6 @@
<if test="staffId != null"> <if test="staffId != null">
#{staffId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR},
</if> </if>
<if test="wxUserId != null">
#{wxUserId,jdbcType=VARCHAR},
</if>
<if test="pushTimes != null"> <if test="pushTimes != null">
#{pushTimes}, #{pushTimes},
</if> </if>
...@@ -196,18 +189,12 @@ ...@@ -196,18 +189,12 @@
<if test="staffId != null"> <if test="staffId != null">
staff_id = #{staffId,jdbcType=VARCHAR}, staff_id = #{staffId,jdbcType=VARCHAR},
</if> </if>
<if test="wxUserId != null">
wx_user_id = #{wxUserId,jdbcType=VARCHAR},
</if>
<if test="relationKey != null"> <if test="relationKey != null">
relation_key = #{relationKey,jdbcType=VARCHAR}, relation_key = #{relationKey,jdbcType=VARCHAR},
</if> </if>
<if test="statusFlag != null"> <if test="statusFlag != null">
status_flag = #{statusFlag,jdbcType=INTEGER}, status_flag = #{statusFlag,jdbcType=INTEGER},
</if> </if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -229,7 +216,7 @@ ...@@ -229,7 +216,7 @@
set status_flag = 2, set status_flag = 2,
update_time = now() update_time = now()
where external_user_id = #{externalUserId,jdbcType=VARCHAR} where external_user_id = #{externalUserId,jdbcType=VARCHAR}
and wx_user_id = #{wxUserId} and staff_id = #{staffId}
and status_flag in (1, 3, 4) and status_flag in (1, 3, 4)
</update> </update>
...@@ -241,7 +228,7 @@ ...@@ -241,7 +228,7 @@
update_time = now() update_time = now()
where where
wx_enterprise_id=#{wxEnterpriseId} wx_enterprise_id=#{wxEnterpriseId}
and wx_user_id = #{wxUserId} and staff_id = #{staffId}
and status_flag in(1,3,4) and status_flag in(1,3,4)
and external_user_id in and external_user_id in
<foreach collection="externalUserIds" item="item" open="(" separator="," close=")"> <foreach collection="externalUserIds" item="item" open="(" separator="," close=")">
...@@ -300,7 +287,7 @@ ...@@ -300,7 +287,7 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where 1 where 1
and wx_user_id = #{userId} and staffId = #{staffId}
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and external_name = #{name} and external_name = #{name}
and add_create_time = #{createTime} and add_create_time = #{createTime}
...@@ -311,7 +298,7 @@ ...@@ -311,7 +298,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{userId,jdbcType=VARCHAR} where staff_id = #{staffId,jdbcType=VARCHAR}
and external_user_id = #{externalUserid} and external_user_id = #{externalUserid}
and status_flag = #{statusFlag} and status_flag = #{statusFlag}
</select> </select>
...@@ -334,7 +321,7 @@ ...@@ -334,7 +321,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{userId,jdbcType=VARCHAR} where staff_id = #{staffId,jdbcType=VARCHAR}
and external_user_id = #{externalUserid} and external_user_id = #{externalUserid}
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and status_flag in(1,3,4) and status_flag in(1,3,4)
...@@ -360,9 +347,9 @@ ...@@ -360,9 +347,9 @@
<foreach item="memberId" index="index" collection="sendMemberIds" open="(" separator="," close=")"> <foreach item="memberId" index="index" collection="sendMemberIds" open="(" separator="," close=")">
#{memberId, jdbcType=CHAR} #{memberId, jdbcType=CHAR}
</foreach> </foreach>
and wx_user_id in and staff_id in
<foreach item="wxUserId" index="index" collection="userIdList" open="(" separator="," close=")"> <foreach item="staffId" index="index" collection="staffIdList" open="(" separator="," close=")">
#{wxUserId, jdbcType=CHAR} #{staffId, jdbcType=CHAR}
</foreach> </foreach>
and member_id is not null and member_id is not null
group by external_user_id group by external_user_id
...@@ -372,7 +359,7 @@ ...@@ -372,7 +359,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{wxUserId,jdbcType=VARCHAR} where staff_id = #{staffId,jdbcType=VARCHAR}
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1 and status_flag = 1
</select> </select>
...@@ -381,9 +368,9 @@ ...@@ -381,9 +368,9 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id in where staff_id in
<foreach item="wxUserId" index="index" collection="userIdList" open="(" separator="," close=")"> <foreach item="staffId" index="index" collection="staffIdList" open="(" separator="," close=")">
#{wxUserId, jdbcType=CHAR} #{staffId, jdbcType=CHAR}
</foreach> </foreach>
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1 and status_flag = 1
...@@ -393,7 +380,7 @@ ...@@ -393,7 +380,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{wxUserId} where staff_id = #{staffId}
and member_id = #{memberId} and member_id = #{memberId}
and status_flag = 1 and status_flag = 1
and external_user_id is not null and external_user_id is not null
...@@ -433,7 +420,7 @@ ...@@ -433,7 +420,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{wxUserId,jdbcType=VARCHAR} where staff_id = #{staffId,jdbcType=VARCHAR}
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and status_flag in and status_flag in
<foreach collection="statusFlags" item="item" separator="," open="(" close=")"> <foreach collection="statusFlags" item="item" separator="," open="(" close=")">
...@@ -455,7 +442,7 @@ ...@@ -455,7 +442,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{wxUserId,jdbcType=VARCHAR} where staff_id = #{staffId,jdbcType=VARCHAR}
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and enterprise_id = #{enterpriseId} and enterprise_id = #{enterpriseId}
and external_user_id = #{externalUserId} and external_user_id = #{externalUserId}
...@@ -473,22 +460,13 @@ ...@@ -473,22 +460,13 @@
and status_flag = 1 and status_flag = 1
</select> </select>
<select id="listByWxUserIdAndWxEnterpriseId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related
where wx_enterprise_id = #{wxEnterpriseId}
and enterprise_id = #{enterpriseId}
and wx_user_id = #{wxUserId}
and status_flag = 1
</select>
<select id="getLastByExTernalUseridAndWxUserIdNoStatus" resultMap="BaseResultMap"> <select id="getLastByExTernalUseridAndWxUserIdNoStatus" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_enterprise_id = #{wxEnterpriseId} where wx_enterprise_id = #{wxEnterpriseId}
and wx_user_id = #{wxUserId} and staff_id = #{staffId}
and external_user_id = #{externalUserid} and external_user_id = #{externalUserid}
order by create_time desc limit 1 order by create_time desc limit 1
</select> </select>
...@@ -621,7 +599,7 @@ ...@@ -621,7 +599,7 @@
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_enterprise_id = #{wxEnterpriseId} where wx_enterprise_id = #{wxEnterpriseId}
and enterprise_id = #{enterpriseId} and enterprise_id = #{enterpriseId}
and wx_user_id = #{wxUserId} and staff_id = #{staffId}
and clerk_id = #{clerkId} and clerk_id = #{clerkId}
AND status_flag = 1 AND status_flag = 1
</select> </select>
...@@ -631,7 +609,7 @@ ...@@ -631,7 +609,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{wxUserId,jdbcType=VARCHAR} where staff_id = #{staffId,jdbcType=VARCHAR}
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and enterprise_id = #{enterpriseId} and enterprise_id = #{enterpriseId}
and external_user_id = #{externalUserId} and external_user_id = #{externalUserId}
...@@ -644,7 +622,7 @@ ...@@ -644,7 +622,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{wxUserId,jdbcType=VARCHAR} where staff_id = #{staffId,jdbcType=VARCHAR}
and wx_enterprise_id = #{wxEnterpriseId} and status_flag in(1,3,4) and wx_enterprise_id = #{wxEnterpriseId} and status_flag in(1,3,4)
</select> </select>
...@@ -652,7 +630,7 @@ ...@@ -652,7 +630,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where wx_user_id = #{wxUserId,jdbcType=VARCHAR} where staff_id = #{staffId}
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
and unionid = #{unionid} and unionid = #{unionid}
and status_flag = 1 and status_flag = 1
...@@ -683,12 +661,4 @@ ...@@ -683,12 +661,4 @@
and status_flag = 1 and status_flag = 1
</select> </select>
<update id="updateUserIdByWxEnterpriseId">
UPDATE tab_haoban_external_clerk_related a
LEFT JOIN tab_haoban_staff b ON a.staff_id = b.staff_id
SET a.wx_user_id = b.wx_user_id,a.update_time= now()
WHERE
a.wx_enterprise_id = #{wxEnterpriseId}
AND a.status_flag IN ( 1, 3, 4 );
</update>
</mapper> </mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
...@@ -126,9 +126,7 @@ ...@@ -126,9 +126,7 @@
a.store_id storeId, a.store_id storeId,
a.clerk_id clerkId, a.clerk_id clerkId,
a.clerk_code clerkCode, a.clerk_code clerkCode,
a.status_flag statusFlag, a.status_flag statusFlag
b.wx_open_user_id openUserId ,
b.wx_user_id qwUserId
from tab_haoban_staff_clerk_relation a from tab_haoban_staff_clerk_relation a
left join tab_haoban_staff b on b.staff_id = a.staff_id left join tab_haoban_staff b on b.staff_id = a.staff_id
where a.status_flag=1 where a.status_flag=1
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
...@@ -1138,7 +1138,7 @@ public class ClerkController extends WebBaseController { ...@@ -1138,7 +1138,7 @@ public class ClerkController extends WebBaseController {
statusFlags.add(status); statusFlags.add(status);
} }
StaffDTO staff = staffApiService.selectById(staffId); StaffDTO staff = staffApiService.selectById(staffId);
Page<ExternalClerkRelatedDTO> page = externalClerkRelatedApiService.pageExternalClerk(staff.getWxEnterpriseId(), staff.getWxUserId(), statusFlags, pageInfo); Page<ExternalClerkRelatedDTO> page = externalClerkRelatedApiService.pageExternalClerk(staff.getWxEnterpriseId(), staffId, statusFlags, pageInfo);
PageResult2 retPage = PageUtil.getPageInfo(page); PageResult2 retPage = PageUtil.getPageInfo(page);
return resultResponse(HaoBanErrCode.ERR_1, retPage); return resultResponse(HaoBanErrCode.ERR_1, retPage);
} }
...@@ -1168,7 +1168,7 @@ public class ClerkController extends WebBaseController { ...@@ -1168,7 +1168,7 @@ public class ClerkController extends WebBaseController {
if (staffDTO == null) { if (staffDTO == null) {
return RestResponse.failure(HaoBanErrCode.ERR_6.getCode() + "", HaoBanErrCode.ERR_6.getMsg()); return RestResponse.failure(HaoBanErrCode.ERR_6.getCode() + "", HaoBanErrCode.ERR_6.getMsg());
} }
int friendCount = externalClerkRelatedApiService.countFriendCountByClerkId(qo.getWxEnterpriseId(), qo.getEnterpriseId(), staffDTO.getWxUserId(), qo.getClerkId()); int friendCount = externalClerkRelatedApiService.countFriendCountByClerkId(qo.getWxEnterpriseId(), qo.getEnterpriseId(), staffDTO.getStaffId(), qo.getClerkId());
int memberCount = customerApiService.countMember(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId()); int memberCount = customerApiService.countMember(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId());
ret.setFriendCount(friendCount); ret.setFriendCount(friendCount);
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
...@@ -563,7 +563,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -563,7 +563,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
} else { } else {
//是否需修复数据 //是否需修复数据
String unionId = externalUserDTO.getUnionId(); String unionId = externalUserDTO.getUnionId();
ExternalClerkRelatedDTO externalClerkRelatedDTO = externalClerkRelatedApiService.getByWxEnterpriseIdAndUnionId(wxEnterpriseId, wxUserId, unionId); ExternalClerkRelatedDTO externalClerkRelatedDTO = externalClerkRelatedApiService.getByWxEnterpriseIdAndUnionId(wxEnterpriseId, staffId, unionId);
if (externalClerkRelatedDTO != null) { if (externalClerkRelatedDTO != null) {
String memberUnionidRelatedId = externalClerkRelatedDTO.getMemberUnionidRelatedId(); String memberUnionidRelatedId = externalClerkRelatedDTO.getMemberUnionidRelatedId();
MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getById(memberUnionidRelatedId); MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getById(memberUnionidRelatedId);
...@@ -578,7 +578,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -578,7 +578,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_11123); return resultResponse(HaoBanErrCode.ERR_11123);
} }
logger.info("会员数据：{}", JSON.toJSONString(memberUnionidRelatedDTO)); logger.info("会员数据：{}", JSON.toJSONString(memberUnionidRelatedDTO));
ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, gicEnterpriseId, memberUnionidRelatedDTO.getExternalUserid()); ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, staffId, gicEnterpriseId, memberUnionidRelatedDTO.getExternalUserid());
if (clerkRelatedDTO == null) { if (clerkRelatedDTO == null) {
logger.info("该企业没有对应需要发送好友关系的信息，wxEnterpriseId:{},externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId); logger.info("该企业没有对应需要发送好友关系的信息，wxEnterpriseId:{},externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);
return resultResponse(HaoBanErrCode.ERR_11123); return resultResponse(HaoBanErrCode.ERR_11123);
......
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