Merge branch 'bugfix/2023-03-06' into 'master'

Bugfix/2023 03 06

See merge request !1004

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

@@ -23,6 +23,7 @@ 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);
     

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

@@ -98,10 +98,12 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             clerkName = clerkDTO.getClerkName();
         }
         String operClerkId = infoDTO.getOptStaffId();
-        clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkRelation.getClerkId());
+        //操作人只有staffId,operName字段存储成员名称
+        TabHaobanStaff tabHaobanStaff = staffService.selectById(operClerkId);
+//        clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkRelation.getClerkId());
         String operName = null;
-        if (null != clerkDTO) {
-            operName = clerkDTO.getClerkName();
+        if (null != tabHaobanStaff) {
+            operName = tabHaobanStaff.getStaffName();
         }
         TabHaobanStaffClerkBindLog enity = new TabHaobanStaffClerkBindLog();
         enity.setClerkId(clerkRelation.getClerkId());
@@ -491,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;
@@ -528,11 +530,13 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
                 hmQrcodeService.updateClerkNameByClerkId(enterpriseId, clerkId, clerkDTO.getClerkName(), clerkDTO.getClerkCode());
             } else if (clerkType == 2) {
                 logger.info("区经变更为导购,解绑：{}", clerkId);
-                //解绑
+                //解绑,判断当前区经是否开启好办权限，不开启则解绑
+                if (clerkDTO.getEnableHaoban() == null || clerkDTO.getEnableHaoban()==false){
                     staffClerkRelationService.delBind(clerkId, "-1", ChannelCodeEnum.GIC_CLERK_DEL_UNBIND.getCode(), null,null);
                 }
             }
         }
+    }
 
     // 导购门店转移
     private void moveOrAddClerk(ClerkSyncQDTO clerkSyncQDTO, StaffClerkRelationDTO oldRelationDTO) {

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

@@ -90,6 +90,14 @@
         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
+    </select>
+    
     
     <update id="changeStatusByClerkId">
         update tab_haoban_staff_clerk_relation