加好友

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

@@ -30,7 +30,6 @@ import com.gic.api.base.commons.JSONResponse;
 import com.gic.api.base.dto.SubscribeMessageDTO;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
-import com.gic.clerk.api.service.PowerService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
@@ -182,8 +181,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     @Autowired
     private ExternalClerkRelatedService externalClerkRelatedService;
     @Autowired
-    private PowerService powerService;
-    @Autowired
     private MiniprogramSettingService miniprogramSettingService;
     @Autowired
     private WelcomeService welcomeService;
@@ -614,7 +611,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("【新增外部联系人】创建member,导购为空返回:{}", clerkCode);
             return "";
         }
-        String qrcodeParam = "clerk_clerk_"+clerk.getClerkId() ;
+        String qrcodeParam = clerk.getQrcodeParam();
+        if (StringUtils.isBlank(qrcodeParam)) {
+            log.info("导购码不存在：" + clerkCode);
+            qrcodeParam = "clerk_clerk_"+clerk.getClerkId() ;
+        }
         String memberId = null ;
         if (StringUtils.isNotBlank(mobile)) {
             memberId = memberService.getMemberIdByPhoneNumber(mobile, enterpriseId);

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

@@ -39,7 +39,7 @@ import com.gic.wechat.api.service.qywx.QywxExternalUserService;
 public class QwFriendApiServiceImpl implements QwFriendApiService {
 
     private static final Logger log = LogManager.getLogger(QwFriendApiService.class);
-    private static final int subjectType = 1 ;
+    private static final int subjectType = 0 ;
 
     @Autowired
     private EnterpriseUseForbidService enterpriseUseForbidService;

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
-import com.gic.clerk.api.service.PowerService;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
@@ -55,8 +54,6 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
     @Autowired
     private ClerkService clerkService;
     @Autowired
-    private PowerService powerService;
-    @Autowired
     private FriendClerkSyncNewOperation friendClerkSyncNewOperation;
     @Autowired
     private WxEnterpriseRelatedService wxEnterpriseRelatedService;
@@ -198,7 +195,11 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         if (clerk == null) {
             return "导购不存在:" + clerkCode;
         }
-        String qrcodeParam = "clerk_clerk_"+clerk.getClerkId() ;
+        String qrcodeParam = clerk.getQrcodeParam();
+        if (StringUtils.isBlank(qrcodeParam)) {
+            logger.info("导购码不存在：" + clerkCode);
+            qrcodeParam = "clerk_clerk_"+clerk.getClerkId() ;
+        }
         QywxMemberQDTO qdto = new QywxMemberQDTO() ;
         qdto.setEnterpriseId(enterpriseId);
         qdto.setNick(externalUserDTO.getName());