Merge branch 'master_bug_1101' into 'master'

Master bug 1101

See merge request !379

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;
@@ -616,15 +613,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         String qrcodeParam = clerk.getQrcodeParam();
         if (StringUtils.isBlank(qrcodeParam)) {
-            powerService.saveClerkQrCode(clerk.getClerkId());
-            clerk = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
-            qrcodeParam = clerk.getQrcodeParam();
+            log.info("导购码不存在：" + clerkCode);
+            qrcodeParam = "clerk_clerk_"+clerk.getClerkId() ;
         }
-        if (StringUtils.isBlank(qrcodeParam)) {
-            log.info("新增外部联系人,创建member,导购二维码为空,clerkId={}", clerk.getClerkId());
-            return "";
-        }
-        
         String memberId = null ;
         if (StringUtils.isNotBlank(mobile)) {
             memberId = memberService.getMemberIdByPhoneNumber(mobile, enterpriseId);

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;
@@ -200,12 +197,8 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
         }
         String qrcodeParam = clerk.getQrcodeParam();
         if (StringUtils.isBlank(qrcodeParam)) {
-            powerService.saveClerkQrCode(clerk.getClerkId());
-            clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
-            qrcodeParam = clerk.getQrcodeParam();
-        }
-        if (StringUtils.isBlank(qrcodeParam)) {
-            return "导购码不存在：" + clerkCode;
+            logger.info("导购码不存在：" + clerkCode);
+            qrcodeParam = "clerk_clerk_"+clerk.getClerkId() ;
         }
         QywxMemberQDTO qdto = new QywxMemberQDTO() ;
         qdto.setEnterpriseId(enterpriseId);