创建会员的判断

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/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

@@ -496,7 +496,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 ;
@@ -529,15 +529,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() ;

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);