Commit 55b6663a by fudahua

Merge remote-tracking branch 'origin/developer' into developer

parents 593cc5de ea4f6afc
...@@ -195,7 +195,10 @@ public interface TabHaobanExternalClerkRelatedMapper { ...@@ -195,7 +195,10 @@ public interface TabHaobanExternalClerkRelatedMapper {
* 根据会员id更新新老会员id * 根据会员id更新新老会员id
* *
* @param memberId * @param memberId
* @return * @param oldMemberId 老会员id
* @return int
* @author mozhu
* @date 2021-10-21 10:22:13
*/ */
int updateMemberIdByMemberId(@Param("memberId") String memberId, @Param("oldMemberId") String oldMemberId); int updateMemberIdByMemberId(@Param("memberId") String memberId, @Param("oldMemberId") String oldMemberId);
...@@ -212,16 +215,17 @@ public interface TabHaobanExternalClerkRelatedMapper { ...@@ -212,16 +215,17 @@ public interface TabHaobanExternalClerkRelatedMapper {
/** /**
* 是否是盆友 * 通过会员id和员工id查询数据
* *
* @param memberId 成员身份 * @param staffId 员工id
* @param clerkId 职员id
* @param enterpriseId 企业标识 * @param enterpriseId 企业标识
* @param memberId 会员ID
* @return {@link TabHaobanExternalClerkRelated } * @return {@link TabHaobanExternalClerkRelated }
* @author mozhu * @author mozhu
* @date 2021-10-15 11:40:33 * @date 2021-10-21 10:41:28
*/ */
int isFriends(@Param("memberId") String memberId, TabHaobanExternalClerkRelated getByMemberIdAndStaffId(@Param("staffId") String staffId,
@Param("clerkId") String clerkId, @Param("enterpriseId") String enterpriseId,
@Param("enterpriseId") String enterpriseId); @Param("memberId")String memberId);
} }
\ No newline at end of file
...@@ -14,7 +14,10 @@ import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMa ...@@ -14,7 +14,10 @@ import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMa
import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper; import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
import com.gic.haoban.manage.service.entity.MemberClerkChatConfig; import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation; import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
import com.gic.haoban.manage.service.service.*; import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
import com.gic.haoban.manage.service.service.StaffClerkRelationService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -42,10 +45,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -42,10 +45,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
private ExternalClerkRelatedService externalClerkRelatedService; private ExternalClerkRelatedService externalClerkRelatedService;
@Autowired @Autowired
private StaffService staffService;
@Autowired
private ClerkMainStoreRelatedService clerkMainStoreRelatedService; private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
@Autowired @Autowired
...@@ -228,6 +227,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -228,6 +227,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkId(clerkId)); return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkId(clerkId));
} }
@Override
public StaffClerkRelationDTO getByClerkIdNoStatus(String clerkId){ public StaffClerkRelationDTO getByClerkIdNoStatus(String clerkId){
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkIdNoStatus(clerkId)); return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkIdNoStatus(clerkId));
} }
......
...@@ -15,8 +15,10 @@ import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO; ...@@ -15,8 +15,10 @@ import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService; import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper; import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper; import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
import com.gic.haoban.manage.service.entity.MemberUnionidRelated; import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated; import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo; import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
import com.gic.mq.sdk.GicMQClient; import com.gic.mq.sdk.GicMQClient;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
...@@ -40,6 +42,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA ...@@ -40,6 +42,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper; private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
@Autowired @Autowired
private MemberUnionidRelatedMapper memberUnionidRelatedMapper; private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
@Autowired
private TabHaobanStaffClerkRelationMapper staffClerkRelationMapper;
/** /**
* 查询导购好友关联 * 查询导购好友关联
...@@ -236,8 +240,17 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA ...@@ -236,8 +240,17 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
@Override @Override
public boolean isFriends(String memberId, String clerkId, String enterpriseId) { public boolean isFriends(String memberId, String clerkId, String enterpriseId) {
int friends = tabHaobanExternalClerkRelatedMapper.isFriends(memberId, clerkId, enterpriseId); TabHaobanStaffClerkRelation staffClerkRelation = staffClerkRelationMapper.getByClerkId(clerkId);
return friends > 0; if (staffClerkRelation == null) {
return false;
}
String staffId = staffClerkRelation.getStaffId();
log.info("【查询会员】clerkId = {},staffId={},memberId={}", clerkId, staffId, memberId);
TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByMemberIdAndStaffId(staffId, enterpriseId, memberId);
if (externalClerkRelated == null) {
return false;
}
return externalClerkRelated.getStatusFlag() == 1;
} }
} }
...@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.service.out.impl; ...@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.service.out.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.digest.MD5;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -46,11 +45,6 @@ import com.gic.member.api.service.MemberOpenCardBusinessService; ...@@ -46,11 +45,6 @@ import com.gic.member.api.service.MemberOpenCardBusinessService;
import com.gic.member.api.service.MemberService; import com.gic.member.api.service.MemberService;
import com.gic.mq.sdk.GicMQClient; import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil; import com.gic.redis.data.util.RedisUtil;
import com.gic.search.engine.api.constant.MemberDataEnum;
import com.gic.search.engine.api.constant.OperateEnum;
import com.gic.search.engine.api.dto.ESResponseQueryBatch;
import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
import com.gic.search.engine.api.filter.NewNodeAddUtil;
import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService; import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
import com.gic.wechat.api.dto.qywx.*; import com.gic.wechat.api.dto.qywx.*;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService; import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
...@@ -227,9 +221,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -227,9 +221,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
ClerkDTO clerkDTO = clerkService.getclerkById(clerkId); ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
if (clerkDTO != null) { if (clerkDTO != null) {
Integer isManager = clerkDTO.getClerkType(); Integer isManager = clerkDTO.getClerkType();
if (isManager != null && isManager == 1 && clerkDTO.getStatus() == 1) { return isManager != null && isManager == 1 && clerkDTO.getStatus() == 1;
return true;
}
} }
return false; return false;
} }
...@@ -954,8 +946,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -954,8 +946,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
pushTagSync(dto.getExternalUserid(), dto.getWxUserId() pushTagSync(dto.getExternalUserid(), dto.getWxUserId()
, GicQywxSyncTypeEnum.FRIEND_TAG_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterprise.getWxEnterpriseId(), null); , GicQywxSyncTypeEnum.FRIEND_TAG_SYNC.getType(), QywxSyncTaskTypeEnum.MEMBER_SYNC.getType(), wxEnterprise.getWxEnterpriseId(), null);
// qywxTagApiService.syncQywxTagToGicByExternalUserId(wxEnterprise.getWxEnterpriseId(), dto.getExternalUserid(), dto.getWxUserId());
} }
@Override @Override
...@@ -964,7 +954,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -964,7 +954,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if (staff == null) { if (staff == null) {
return null; return null;
} }
log.info("【查询会员】wxUserId={},unionid={}", staff.getWxUserId(), memberId); log.info("【查询会员】wxUserId={},memberId={}", staff.getWxUserId(), memberId);
return externalClerkRelatedService.getByMemberId(staff.getWxUserId(), memberId); return externalClerkRelatedService.getByMemberId(staff.getWxUserId(), memberId);
} }
......
package com.gic.haoban.manage.service.service.out.impl; package com.gic.haoban.manage.service.service.out.impl;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil; import com.gic.commons.util.GICMQClientUtil;
import com.gic.commons.util.ToolUtil; import com.gic.commons.util.ToolUtil;
import com.gic.enterprise.api.dto.*; import com.gic.enterprise.api.dto.*;
import com.gic.enterprise.api.service.AuthorizeService; import com.gic.enterprise.api.service.AuthorizeService;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreGroupService;
import com.gic.enterprise.api.service.StoreService; import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.ServiceResponse; import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.common.utils.UuidUtil;
import com.gic.haoban.manage.api.dto.*; import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum; import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
import com.gic.haoban.manage.service.entity.*; import com.gic.haoban.manage.service.entity.*;
import com.gic.haoban.manage.service.service.*; import com.gic.haoban.manage.service.service.*;
import com.gic.mq.sdk.GicMQClient; import com.gic.mq.sdk.GicMQClient;
...@@ -28,16 +30,12 @@ import org.apache.logging.log4j.LogManager; ...@@ -28,16 +30,12 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreGroupService;
import com.gic.haoban.common.utils.UuidUtil;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Service @Service
public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApiService { public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApiService {
private static final Logger logger = LogManager.getLogger(WxEnterpriseRelatedApiServiceImpl.class); private static final Logger logger = LogManager.getLogger(WxEnterpriseRelatedApiServiceImpl.class);
...@@ -86,82 +84,32 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi ...@@ -86,82 +84,32 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
return wxEnterpriseRelatedMapper.findAllEnterpriseId(); return wxEnterpriseRelatedMapper.findAllEnterpriseId();
} }
//获取门店详情
public boolean isEnterpriseOver(String eid) {
EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(eid);
if(enterprise == null || enterprise.getExpireTime() == null){
return false;
}
if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
return false;
}
return true;
}
@Override @Override
public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId( public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(
String wxEnterpriseId) { String wxEnterpriseId) {
List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId); List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList); List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
if (CollectionUtils.isEmpty(result)){ if (CollectionUtils.isEmpty(result)){
return result; return result;
} }
// for (EnterpriseDetailDTO enterpriseDetailDTO : result) {
// String enterpriseId = enterpriseDetailDTO.getEnterpriseId();
// int gicAllCount = storeGroupService.gicDepartmentCount(enterpriseId);
// int syncCount = departmentService.countSyncDepartmentByEnterpriseId(enterpriseId);
// logger.info("【企业数量】gicAllCount={},syncCount={}",gicAllCount,syncCount);
// int nodeCount = gicAllCount - syncCount;
// enterpriseDetailDTO.setNodeCount(nodeCount);
// }
return result; return result;
} }
// public int getNodeCount(String enterpriseId,String parentId,int type) {
// int nodeCount = 0;
// List<GicTreeDTO> departmentList = storeGroupService.listGicTree(enterpriseId,type, parentId);
// for (GicTreeDTO gicTreeDTO : departmentList) {
// if(departmentService.getByRelatedId(gicTreeDTO.getId()) == null) {
// nodeCount ++;
// }
// List<GicTreeDTO> departmentList2 = storeGroupService.listGicTree(enterpriseId,gicTreeDTO.getType(), gicTreeDTO.getId());
// while(!departmentList2.isEmpty()) {
// for (GicTreeDTO gicTreeDTO2 : departmentList) {
// nodeCount += getNodeCount(enterpriseId,gicTreeDTO2.getId(),gicTreeDTO2.getType());
// }
// }
// }
//
// return nodeCount;
//
// }
@Override @Override
public String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId) { public String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId) {
TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedService.getByGicEnterpriseIdByEnterpriseRelatedId(wxEnterpriseRelatedId); TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedService.getByGicEnterpriseIdByEnterpriseRelatedId(wxEnterpriseRelatedId);
if(tab != null) { return tab != null ? tab.getEnterpriseId() : null;
return tab.getEnterpriseId();
}
return null;
} }
@Override @Override
public boolean enterpriseUseNew(String enterpriseId) { public boolean enterpriseUseNew(String enterpriseId) {
if (null == enterpriseId) { if (null == enterpriseId) {
return false; return false;
}
List<String> eids = new ArrayList<>();
eids.add(enterpriseId);
List<TabHaobanWxEnterpriseRelated> retList = wxEnterpriseRelatedMapper.listEnterpriseByEnterpriseIds(eids);
if (CollectionUtils.isEmpty(retList)) {
return false;
} }
return true; List<String> eids = new ArrayList<>();
eids.add(enterpriseId);
List<TabHaobanWxEnterpriseRelated> retList = wxEnterpriseRelatedMapper.listEnterpriseByEnterpriseIds(eids);
return !CollectionUtils.isEmpty(retList);
} }
@Override @Override
...@@ -320,10 +268,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi ...@@ -320,10 +268,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
if (tab == null) { if (tab == null) {
return true; return true;
} }
if (detailDTO.getWxEnterpriseRelatedId() != null && tab.getWxEnterpriseRelatedId().equals(detailDTO.getWxEnterpriseRelatedId())) { return detailDTO.getWxEnterpriseRelatedId() != null && tab.getWxEnterpriseRelatedId().equals(detailDTO.getWxEnterpriseRelatedId());
return true;
}
return false;
} }
...@@ -343,10 +288,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi ...@@ -343,10 +288,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
} }
logger.info("绑定的部分:{},{}", detailDTO.getWxEnterpriseId(), JSONObject.toJSONString(storeRanges)); logger.info("绑定的部分:{},{}", detailDTO.getWxEnterpriseId(), JSONObject.toJSONString(storeRanges));
Set<TabStoreRange> mid = storeRanges.stream().filter(tab -> !tab.getWxEnterpriseId().equals(detailDTO.getWxEnterpriseId())).collect(Collectors.toSet()); Set<TabStoreRange> mid = storeRanges.stream().filter(tab -> !tab.getWxEnterpriseId().equals(detailDTO.getWxEnterpriseId())).collect(Collectors.toSet());
if (CollectionUtils.isEmpty(mid)) { return CollectionUtils.isEmpty(mid);
return true;
}
return false;
} }
@Override @Override
......
...@@ -573,12 +573,16 @@ ...@@ -573,12 +573,16 @@
and enterprise_id = #{enterpriseId} and enterprise_id = #{enterpriseId}
</update> </update>
<select id="isFriends" resultType="int">
select count(*) <select id="getByMemberIdAndStaffId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
where member_id = #{memberId} where
and enterprise_id = #{enterpriseId} member_id = #{memberId}
and clerk_id = #{clerkId} and enterprise_id = #{enterpriseId}
and status_flag = 1 AND staff_id = #{staffId}
AND status_flag = 1 limit 1
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment