Merge branch 'master_xgh_pendingid' into 'developer'

Master xgh pendingid

See merge request !294

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

@@ -40,4 +40,6 @@ public interface WxEnterpriseRelatedService {
 	int getRelationCount(String enterpriseId) ;
 	
 	public WxEnterpriseRelationBO getHeadEnterprise(String enterpriseId) ;
+	
+	public boolean getAddByWelcomeFlag(TabHaobanWxEnterpriseRelated wxEnterpriseRelated , String unionid) ;
 }

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

@@ -131,6 +131,7 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	    Date addDate = DateUtil.addDay(DateUtil.getStartTimeOfDay(),-addDay) ;
 	    List<String> list = this.mapper.listNoDepartStaff(wxEnterpriseId, addDate) ;
 	    if(CollectionUtils.isNotEmpty(list)) {
+	        logger.info("修复成员部门,成员数={}",list.size());
 	        for(String staffId : list) {
 	            this.repairStaffDepart(staffId);
 	        }

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

@@ -4,6 +4,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -85,4 +86,19 @@ public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedServic
         }
         return null;
     }
+    
+    
+    @Override
+    public boolean getAddByWelcomeFlag(TabHaobanWxEnterpriseRelated wxEnterpriseRelated, String unionid) {
+        int openCardFlag = wxEnterpriseRelated.getMemberOpenCardFlag() ;
+        int wxEnterpriseType = wxEnterpriseRelated.getWxEnterpriseType() ;
+        // unionid存在,并且在同一开放平台,可以创建客户
+        if(StringUtils.isNotBlank(unionid) && openCardFlag==0) {
+            return false ;
+        }
+        if(openCardFlag != 0 || wxEnterpriseType !=0)  {
+            return true ;
+        }
+        return false ;
+    }
 }

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

@@ -225,17 +225,19 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Override
     public void dealQywxExternalUser(String params) {
-        log.info("处理外部联系人回调：{}", params);
         DealQywxExternalUserPojo externalUserPojo = JSONObject.parseObject(params, DealQywxExternalUserPojo.class);
         QwFrientNoticeDTO qwFrientNoticeDTO = externalUserPojo.getData();
         int type = externalUserPojo.getType();
         String wxUserId = qwFrientNoticeDTO.getWxUserId();
         MemberUnionidRelatedDTO memberUnionidRelatedDTO = EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class, qwFrientNoticeDTO);
         if (type == DealQywxExternalUserPojo.DealType.add.getType()) {
+            log.info("新增外部联系人回调开始：{}", params);
             this.addMemberUnionidRelatedNew(memberUnionidRelatedDTO, wxUserId);
         } else if (type == DealQywxExternalUserPojo.DealType.edit.getType()) {
+            log.info("编辑外部联系人回调开始：{}", params);
             this.editMemberUnionidRelatedProcess(memberUnionidRelatedDTO, wxUserId);
         } else if (type == DealQywxExternalUserPojo.DealType.del.getType()) {
+            log.info("删除外部联系人回调开始：{}", params);
             String changeType = qwFrientNoticeDTO.getChangeType();
             //欧泊莱定制
             if ("del_follow_user".equals(changeType)) {
@@ -414,7 +416,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         // 新增unionid表
         dto = getMemberUnionidRelatedDTONew(dto, wxUserId);
         if (null == dto) {
-            log.info("需待开发和第三方都收到");
+            log.info("新增外部联系人,待开发和第三方回调未都收到");
             return null;
         }
         this.insertExternalClerkRelatedNew(dto, wxUserId,staff.getStaffName());
@@ -422,7 +424,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     }
 
     private void insertExternalClerkRelatedNew(MemberUnionidRelatedDTO dto, String wxUserId , String staffName) {
-        log.info("新增外部联系人开始处理好友表={},wxUserId={},外部联系人id", JSON.toJSONString(dto),wxUserId);
+        log.info("新增外部联系人,处理好友表={},wxUserId={}", JSON.toJSONString(dto),wxUserId);
         String wxEnterpriseId = dto.getWxEnterpriseId();
         String name = dto.getExternalName();
         String createTime = dto.getAddCreateTime();
@@ -504,7 +506,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return;
         }
         String memberId = null;
-        boolean addByWelcome = this.getAddByWelcomeFlag(wxEnterpriseRelated) ;
+        boolean addByWelcome = this.wxEnterpriseRelatedService.getAddByWelcomeFlag(wxEnterpriseRelated,unionid) ;
         log.info("是否通过欢迎语加好友={},wxEnterpriseId:{},enterpriseId={},unionid={}",addByWelcome,wxEnterpriseId,enterpriseId,unionid);
         if(addByWelcome) {
             unionid = null ;
@@ -537,15 +539,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
        this.wxUserAddLogService.save(wxUserAddLogQDTO);
     }
     
-    private boolean getAddByWelcomeFlag(TabHaobanWxEnterpriseRelated wxEnterpriseRelated) {
-        int openCardFlag = wxEnterpriseRelated.getMemberOpenCardFlag() ;
-        int wxEnterpriseType = wxEnterpriseRelated.getWxEnterpriseType() ;
-        if(openCardFlag != 0 || wxEnterpriseType !=0)  {
-            return true ;
-        }
-        return false ;
-    }
-    
     // 获取hm关联的导购
     private String getHmClerk(HmQrcodeDTO hmDTO , String wxEnterpriseId, String staffId) {
         Long hmId = hmDTO.getHmId() ;
@@ -616,9 +609,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String clerkCode = staffClerkRelationDTO.getClerkCode();
         String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
         ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
-        log.info("【新增外部联系人】clerkCode={},unionid:{}", clerkCode, unionId);
+        log.info("【新增外部联系人】创建member,clerkCode={},unionid:{}", clerkCode, unionId);
         if (clerk == null) {
-            log.info("【新增外部联系人】导购为空:{},{}", clerkCode, unionId);
+            log.info("【新增外部联系人】创建member,导购为空返回:{}", clerkCode);
             return "";
         }
         String qrcodeParam = clerk.getQrcodeParam();
@@ -628,7 +621,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             qrcodeParam = clerk.getQrcodeParam();
         }
         if (StringUtils.isBlank(qrcodeParam)) {
-            log.info("导购二维码为空,clerkId={}", clerk.getClerkId());
+            log.info("新增外部联系人,创建member,导购二维码为空,clerkId={}", clerk.getClerkId());
             return "";
         }
         
@@ -637,7 +630,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             memberId = memberService.getMemberIdByPhoneNumber(mobile, enterpriseId);
         }
         if (null == memberId) {
-            log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}", enterpriseId, unionId, name, avatar, qrcodeParam);
             QywxMemberQDTO qdto = new QywxMemberQDTO() ;
             qdto.setEnterpriseId(enterpriseId);
             qdto.setNick(name);
@@ -647,7 +639,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             qdto.setUserId(externalUserid);
             qdto.setSence(2);
             com.gic.api.base.commons.ServiceResponse<MemberSimpleDetailDTO> resp = this.memberEntranceApiService.enterpriseWechatByFriendEntrance(qdto);
-            log.info("加好友,创建member,resp={},param={}",JSON.toJSON(resp),JSON.toJSONString(qdto));
+            log.info("新增外部联系人,创建member,resp={},param={}",JSON.toJSON(resp),JSON.toJSONString(qdto));
             if(resp.isSuccess()) {
                 MemberSimpleDetailDTO member = resp.getResult() ;
                 memberId = member.getMemberId() ;
@@ -656,7 +648,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             }
         }
         if (memberId == null) {
-            log.info("查询/创建会员失败,unionid={},外部联系人id={},", unionId,externalUserid);
+            log.info("新增外部联系人,创建member失败,unionid={},外部联系人id={},", unionId,externalUserid);
             return "";
         }
         String storeId = staffClerkRelationDTO.getStoreId();
@@ -1080,7 +1072,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         if (SELF_APP.equals(suiteid)) {
             dto.setSelfExternalUserid(externalUserDTO.getExternalUserId());
-            // 待开发回调过来的外部联系人id设置null
+            // 代开发回调过来的外部联系人id设置null
             dto.setExternalUserid(null);
         } else {
             dto.setExternalUserid(externalUserDTO.getExternalUserId());
@@ -1106,7 +1098,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return null;
         }
         
-        log.info("好办和好办助手均已回调：{}", JSON.toJSONString(dto));
+        log.info("新增外部联系人,unionid数据={}", JSON.toJSONString(dto));
         String memberUnionidRelatedId = memberUnionRelatedService.addMemberUnionidRelated(dto);
         dto.setMemberUnionidRelatedId(memberUnionidRelatedId);
         RedisUtil.unlock(lockKey);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendSyncNewOperation.java

@@ -187,7 +187,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         externalUserDTO.setWxUserId(wxUserId);
         externalUserDTO.setStaffId(staffId);
 
-        boolean addByWelcome = getAddByWelcomeFlag(wxEnterpriseRelated) ;
+        boolean addByWelcome = this.wxEnterpriseRelatedService.getAddByWelcomeFlag(wxEnterpriseRelated,externalUserDTO.getUnionId()) ;
         if (addByWelcome) {
             logger.info("好友不同开平：{}", JSONObject.toJSONString(externalUserDTO));
             return memberUnionidRelatedApiService.addExternal(externalUserDTO);
@@ -228,15 +228,6 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         return memberUnionidRelatedApiService.addExternal(externalUserDTO);
     }
     
-    private boolean getAddByWelcomeFlag(TabHaobanWxEnterpriseRelated wxEnterpriseRelated) {
-        int openCardFlag = wxEnterpriseRelated.getMemberOpenCardFlag() ;
-        int wxEnterpriseType = wxEnterpriseRelated.getWxEnterpriseType() ;
-        if(openCardFlag != 0 || wxEnterpriseType !=0)  {
-            return true ;
-        }
-        return false ;
-    }
-    
     public void dealException(String taskId, String dataId, String pDataId, String reason, String relationKey) {
         preDealService.updateFriendStatusByDataId(taskId, dataId, PreDealStatusEnum.exception.getVal(), reason, null, relationKey, PreDealTypeEnum.friend.getVal());
         checkDepartmentTask(taskId, pDataId);