根据导购code查询导购关系bug修复

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java

@@ -23,7 +23,8 @@ public interface TabHaobanStaffClerkRelationMapper {
     StaffClerkRelationDTO getOneByClerkId(@Param("clerkId") String clerkId,@Param("wxEnterpriseId") String wxEnterpriseId);
     
     StaffClerkRelationDTO getByCodeAndEnterpriseId(@Param("clerkCode") String clerkCode, @Param("enterpriseId") String enterpriseId);
-    
+    StaffClerkRelationDTO getStaffClerkRelationDTO(@Param("clerkCode") String clerkCode, @Param("enterpriseId") String enterpriseId);
+
     List<StaffClerkRelationDTO> listByClerkIds(@Param("clerkIds") List<String> clerkIds,   @Param("wxEnterpriseId") String wxEnterpriseId);
     
     StaffClerkRelationDTO getOneByStoreIdAndStaffId(@Param("storeId") String storeId, @Param("staffId") String staffId);

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

@@ -43,6 +43,7 @@ public interface StaffClerkRelationService {
     StaffClerkRelationDTO getBindByClerkId(String clerkId, String wxEnterpriseId);
 
     StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId);
+    StaffClerkRelationDTO getStaffClerkRelationDTO(String clerkCode, String enterpriseId);
 
     String insert(StaffClerkRelationDTO staffClerkRelation);
 

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

@@ -45,6 +45,7 @@ public class StaffClerkBindLogServiceImpl implements StaffClerkBindLogService {
 
     @Override
     public void pushToMq(String staffId, String optStaffId, int optType, int channelCode, String relationId) {
+
         StaffClerkBindLogInfoDTO infoDTO = new StaffClerkBindLogInfoDTO();
         infoDTO.setChannelCode(channelCode);
         infoDTO.setOptStaffId(optStaffId);

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

@@ -216,6 +216,11 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         return mapper.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
     }
 
+    @Override
+    public StaffClerkRelationDTO getStaffClerkRelationDTO(String clerkCode, String enterpriseId) {
+        return mapper.getStaffClerkRelationDTO(clerkCode, enterpriseId);
+    }
+
 
     @Override
     public String insert(StaffClerkRelationDTO staffClerkRelation) {

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

@@ -493,7 +493,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             }
         } else if (type == 2) {
             logger.info("导购门店转移,新的导购和门店,clerkId={},storeId={}", clerkId, clerkSyncQDTO.getStoreId());
-            StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
+            StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getStaffClerkRelationDTO(clerkCode, enterpriseId);
             if (null == oldRelationDTO) {
                 logger.info("导购未关联成员,clerkCode={}", clerkCode);
                 return;

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -86,6 +86,13 @@
      <select id="getByCodeAndEnterpriseId" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
       <include refid="leftJoinStaffSQL"/>
          where a.status_flag = 1 and b.status_flag = 1
+        and a.enterprise_id = #{enterpriseId}
+        and a.clerk_code = #{clerkCode} order by a.create_time desc limit 1
+    </select>
+
+    <select id="getStaffClerkRelationDTO" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
+        <include refid="leftJoinStaffSQL"/>
+        where a.status_flag = 1 and b.status_flag = 1
         and a.manage_flag = 0
         and a.enterprise_id = #{enterpriseId}
         and a.clerk_code = #{clerkCode} order by a.create_time desc limit 1