导购code问题修复

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

@@ -705,7 +705,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String clerkId = staffClerkRelationDTO.getClerkId();
         String clerkCode = staffClerkRelationDTO.getClerkCode();
         String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
-        ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
+        //统一根据导购id查询
+        ClerkDTO clerk = clerkService.getClerkByClerkId(clerkId);
         log.info("【新增外部联系人】创建member,clerkCode={},unionid:{}", clerkCode, unionId);
         if (clerk == null) {
             log.info("【新增外部联系人】创建member,导购为空返回:{}", clerkCode);
@@ -1850,14 +1851,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("好友不同开平：{}", JSONObject.toJSONString(externalUserDTO));
             return this.saveExternalUser(externalUserDTO);
         }
-        String clerkCode = staffClerkRelationDTO.getClerkCode();
-        ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
+        //统一根据导购id查询
+        ClerkDTO clerk = clerkService.getClerkByClerkId(clerkId);
         if (clerk == null) {
-            return "导购不存在:" + clerkCode;
+            return "导购不存在:" + clerkId;
         }
         String qrcodeParam = clerk.getQrcodeParam();
         if (StringUtils.isBlank(qrcodeParam)) {
-            log.info("导购码不存在：" + clerkCode);
+            log.info("导购码不存在：" + clerkId);
             qrcodeParam = "clerk_clerk_"+clerk.getClerkId() ;
         }
         String memberId  = this.getMeberId(enterpriseId, externalUserDTO.getUnionId(), externalUserDTO.getName(), externalUserDTO.getAvatar(), qrcodeParam, externalUserDTO.getExternalUserId(), wxEnterpriseRelated.getWxEnterpriseType(), 1) ;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/MaidianLogController.java

 package com.gic.haoban.manage.web.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
@@ -47,7 +48,8 @@ public class MaidianLogController extends WebBaseController {
             }
             StoreDTO store = storeService.getStore(maidianLogDTO.getStoreId());
             if (store != null) {
-                com.gic.clerk.api.dto.ClerkDTO clerkDTO = clerkService.getClerkByClerkCode(store.getEnterpriseId(), maidianLogDTO.getClerkCode());
+                //统一根据导购id查询
+                ClerkDTO clerkDTO = clerkService.getClerkByClerkId(maidianLogDTO.getClerkId());
                 maidianLogDTO.setEnterpriseId(store.getEnterpriseId());
                 if (clerkDTO != null) {
                     //导购变更门店

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -114,7 +114,8 @@ public class StoreController extends WebBaseController {
                 logger.info("非当前商户,直接跳过={},{}", gicEnterpriseId, enterpriseId);
                 continue;
             }
-            ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
+            //统一根据导购id查询
+            ClerkDTO clerk = clerkService.getClerkByClerkId(staffClerkRelationDTO.getClerkId());
             if (clerk == null) {
                 continue;
             }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -1193,8 +1193,8 @@ public class WxStaffController extends WebBaseController {
                 staffId);
         String storeId = mainDTO == null ? "" : mainDTO.getStoreId();
         for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
-            ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(),
-                    staffClerkRelationDTO.getClerkCode());
+            //统一根据导购id查询
+            ClerkDTO clerk = clerkService.getClerkByClerkId(staffClerkRelationDTO.getClerkId());
             if (clerk != null) {
                 StoreDTO store = storeService.getStore(clerk.getStoreId());
                 // 主门店标志
@@ -1606,7 +1606,8 @@ public class WxStaffController extends WebBaseController {
                 logger.info("非当前商户,直接跳过={},{}", gicEnterpriseId, enterpriseId);
                 continue;
             }
-            ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
+            //统一根据导购id查询
+            ClerkDTO clerk = clerkService.getClerkByClerkId(staffClerkRelationDTO.getClerkId());
             if (clerk == null) {
                 continue;
             }