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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -11,10 +11,19 @@ import com.gic.haoban.manage.api.dto.*;
 
 public interface MemberUnionidRelatedApiService {
 
+    /**
+     * 根据导购导购微信id和会员id查询关联关系
+     *
+     * @param wxUserId : 导购微信id
+     * @param memberId : 会员id
+     * @return : 返回导购与会员关联关系
+     */
+	ExternalClerkRelatedDTO getByWxUserIdMemberId(String wxUserId, String memberId);
+
 	MemberUnionidRelatedDTO getByUnionId(String staffId, String memberId);
-	
+
 	String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
-	
+
 	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
 
     /**
@@ -27,7 +36,7 @@ public interface MemberUnionidRelatedApiService {
 	ExternalClerkRelatedDTO getByMemberId(String staffId, String memberId);
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
-	
+
 	List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId,Date date);
 
 	List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
@@ -50,9 +59,9 @@ public interface MemberUnionidRelatedApiService {
 	String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
 
 	void mqFreshWxFrend(String res);
-	
+
 	void cleanNoExsitFriend(String wxEnterpriseId,String wxUserId,String resWes);
-	
+
 	List<String> listSelfExterialList(String wxEnterpriseId,String wxUserId);
 
 	List<String> listExterialList(String wxEnterpriseId, String wxUserId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -86,12 +86,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	private WxEnterpriseRelatedService wxEnterpriseRelatedService;
 	@Autowired
 	private WxEnterpriseService wxEnterpriseService;
-	
+
 	private static final String SELF_APP = "selfSuiteId";
-	
+
 	@Autowired
 	private MemberOpenCardBusinessService memberOpenCardBusinessService;
-	
+
 	@Autowired
 	private ClerkService clerkService;
 	@Autowired
@@ -99,7 +99,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
 	@Autowired
 	private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
-	
+
 	@Autowired
 	private StaffDepartmentRelatedService staffDepartmentRelatedService;
 	@Autowired
@@ -117,7 +117,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
 	@Autowired
 	private SecretSettingService secretSettingService;
-	
+
 	@Autowired
 	private StaffClerkRelationService staffClerkRelationService;
 	@Autowired
@@ -206,7 +206,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				log.info("会员不存在1");
 				continue;
 			}
-			List<JSONObject> res = responseQuery.getRes();			
+			List<JSONObject> res = responseQuery.getRes();
 			if(CollectionUtil.isEmpty(res)){
 				log.info("会员不存在2");
 				continue;
@@ -219,7 +219,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				log.info("会员门店不存在");
 				continue;
 			}
-			String[] memberStoreIds =storeId.split(" "); 
+			String[] memberStoreIds =storeId.split(" ");
 			List<String> memberStoreIdList = Arrays.asList(memberStoreIds);
 			if(CollectionUtil.isEmpty(memberStoreIdList)){
 				log.info("会员门店不存在");
@@ -240,11 +240,22 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 					dto.setStoreId(resultStoreId.toString());
 					result.add(dto);
 				}
-				
+
 			}
 		}
 		return result;
 	}
+
+	/**
+	 * 根据导购导购微信id和会员id查询关联关系
+	 *
+	 * @return : 返回关联关系
+	 */
+	@Override
+	public ExternalClerkRelatedDTO getByWxUserIdMemberId(String wxUserId, String memberId) {
+		return externalClerkRelatedService.getByMemberId(wxUserId, memberId);
+	}
+
 	@Override
 	public MemberUnionidRelatedDTO getByUnionId(String staffId, String unionid) {
 		TabHaobanStaff staff = staffService.selectById(staffId);
@@ -268,8 +279,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		}
 		return null;
 	}
-	
-	
+
+
 	@Override
 	public String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto) {
         //解析组装信息
@@ -587,10 +598,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		if(wxEnterprise == null){
 			return null;
 		}
-		
+
 		String wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
 		String userId = dto.getWxUserId();
-		String suiteid = dto.getSuiteid();		
+		String suiteid = dto.getSuiteid();
 		String unionIdJson = "";
 		if(SELF_APP.equals(suiteid)){
 			SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
@@ -602,29 +613,29 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		}else{
 			unionIdJson = qywxUserApiService.getExternalUseridInfo(dto.getCorpid(), dto.getSuiteid(), dto.getExternalUserid());
 		}
-		
+
 		if(StringUtils.isBlank(unionIdJson)){
 			log.info("【新增外部联系人回调】unionIdJson=null");
 			return null;
 		}
 		log.info("【新增外部联系人回调】unionIdJson={}",JSON.toJSONString(unionIdJson));
-		
+
 		ExternalUserPojo pojo = getExternalUserPojo(unionIdJson,userId,wxEnterpriseId);
 		String name = pojo.getName();
 		String createTime  = pojo.getAddCreateTime();
-		
+
 		dto.setWxEnterpriseId(wxEnterpriseId);
-		
+
 		dto.setExternalName(name);
 		dto.setAddCreateTime(createTime);
 		dto.setAvatar(pojo.getAvatar());
-		
+
 		String externalUserId = null;
 		String selfExternalUserId = null;
 		String unionId = null;
 		if(SELF_APP.equals(suiteid)){
 			unionId = pojo.getUnionId();
-			selfExternalUserId = dto.getExternalUserid(); 
+			selfExternalUserId = dto.getExternalUserid();
 		}else{
 			externalUserId = dto.getExternalUserid();
 		}
@@ -715,7 +726,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				avatar = jt.getString("avatar");
                 externalUserId = jt.getString("external_userid");
             }
-			
+
 			follow_user = jo.getString("follow_user");
 			if(StringUtils.isNotBlank(follow_user)){
 				JSONArray j = JSON.parseArray(follow_user);
@@ -743,32 +754,32 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		if(wxEnterprise == null){
 			return "";
 		}
-		
+
 		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
 		if(staff == null){
 			return "";
 		}
-		
+
 		SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
 		if (null == secretSetting) {
 			log.info("没有配置secret");
 			return "";
 		}
 		String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(wxEnterprise.getCorpid(), secretSetting.getSecretVal(), selfExternalUserId);
-		
+
 		ExternalUserPojo pojo = getExternalUserPojo(unionIdJson,userId,wxEnterpriseId);
 		String unionId = pojo.getUnionId();
 		String name = pojo.getName();
 		String createTime  = pojo.getAddCreateTime();
-		
-		
+
+
 		MemberUnionidRelatedDTO dto = new MemberUnionidRelatedDTO();
 		String externalUserId = getExternalUserId(wxEnterprise, userId, createTime, name);
-		
+
 		dto.setExternalUserid(externalUserId);
 		dto.setWxEnterpriseId(wxEnterpriseId);
 		dto.setUnionid(unionId);
-		
+
 		dto.setExternalName(name);
 		dto.setAddCreateTime(createTime);
 		dto.setWxUserId(userId);
@@ -776,9 +787,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		if(StringUtils.isBlank(unionId)){
 			return "";
 		}
-		
+
 		dto.setSuiteid(secretSetting.getSecretVal());
-		
+
 		MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByParams(userId, wxEnterpriseId,name,createTime);
 		String uuid = "";
 		if(exsitDTO == null){
@@ -795,13 +806,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			uuid = exsitDTO.getMemberUnionidRelatedId();
 			//return "";
 		}
-		
+
 		//新增门店和导购的关联关系
 		insertExternalClerkRelated(dto);
 		return uuid;
 	}
-	
-	
+
+
 	private String getExternalUserId(WxEnterpriseDTO wxEnterprise,String userId1,String createTime,String name){
 		log.info("新增外部联系人】corpid={},suiteId={},userId1={}",wxEnterprise.getCorpid(),config.getWxSuiteid(),userId1);
 		String wxRes = qywxUserApiService.listExternalUserid(wxEnterprise.getCorpid(), config.getWxSuiteid(), userId1);
@@ -894,12 +905,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		List<MemberUnionidRelated> list = memberUnionidRelatedMapper.listByEnterpriseIdAndDate(enterpriseId,date);
 		return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class,list);
 	}
-	
+
 	@Override
 	public void freshWxFrend(String wxEnterpriseId, String wxUserId,String storeId) {
 		log.info("【刷下好友】wxUserId={}",wxUserId);
 		WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
-		
+
 		String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), config.getWxSuiteid(), wxUserId);
 		List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
 		List<String> externalUserIdList = list.stream().map(external->external.getExternalUserid())
@@ -916,8 +927,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
 			}
 		}
-		
-		
+
+
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
         if (null == secretSetting||secretSetting.getCheckFlag()==0) {
             log.info("没有配置客户联系secret:{}",wxEnterpriseId);
@@ -932,14 +943,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		if(jsonArr.size() == 0) {
 			return;
 		}
-		
-		
+
+
 		for (Object object : jsonArr) {
 			this.add(wxEnterpriseId, object.toString(), wxUserId,storeId);
 		}
-		
+
 	}
-	
+
 	@Override
 	public void mqFreshWxFrend(String res){
 		JSONObject json = JSON.parseObject(res);
@@ -970,7 +981,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
 		return  PageUtil.changePageHelperToCurrentPage(memberUnionRelatedService.pageMemberUnionByParams(userIdList,sendMemberIds,enterpriseId),MemberUnionidRelatedDTO.class);
 	}
-	
+
 	@Override
 	public String sendMessage(String wxEnterpriseId,String userId,List<String> extendUserList,String materialId){
 		WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
@@ -1034,7 +1045,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	public void cleanNoExsitFriend(String wxEnterpriseId, String wxUserId, String wxRes) {
 		log.info("【清除不存在的好友】wxEnterpriseId={},wxUserId={}",wxEnterpriseId,wxUserId);
 		WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
-		
+
 		//String wxRes = qywxUserApiService.listExternalUserid(enterprise.getCorpid(), config.getWxSuiteid(), wxUserId);
 		List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
 		List<String> externalUserIdList = list.stream().map(external->external.getExternalUserid())
@@ -1055,7 +1066,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
 			}
 		}
-		
+
 	}
 	@Override
 	public List<String> listSelfExterialList(String wxEnterpriseId, String wxUserId) {
@@ -1137,7 +1148,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         ExternalUserPojo pojo = getExternalUserPojo(unionIdJson, wxUserId, wxEnterpriseId);
 		return EntityUtil.changeEntityByJSON(ExternalUserDTO.class, pojo);
 	}
-	
+
 	@Override
 	public ExternalUserDTO getExternalUseridInfo(String wxEnterpriseId,String wxUserId, String externalUserId) {
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseService.selectById(wxEnterpriseId);