Merge branch 'master' into 'feature/订单中台'

# Conflicts:
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

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/MessageApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl;
 
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -17,6 +18,9 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
@@ -68,6 +72,7 @@ import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
 import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
 import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
+import com.gic.wechat.api.dto.qywx.QywxNewUseridDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
@@ -256,10 +261,24 @@ public class MessageApiServiceImpl implements MessageApiService {
             // 修改
             TabHaobanStaff oldStaff = this.staffService.selectByUserIdAndEnterpriseId(userid, wxEnterpriseId);
             if (oldStaff == null) {
+                //员工可能修改userId，需要拿到openUserId再去查询一次
+                WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+                if (qwDTO != null && (qwDTO.getWxSecurityType() == 1 || qwDTO.getWxSecurityType() == 3)){
+                    String openUserid = getOpenUserid(userid, qwDTO);
+                    if (StringUtils.isNotBlank(openUserid)){
+                        oldStaff = this.staffService.selectByUserIdAndEnterpriseId(openUserid, wxEnterpriseId);
+                    }
+                }
+            }
+            if (oldStaff == null){
                 log.error("成员同步更新失败，无历史员工数据：userid:{},wxEnterpriseId:{}", userid, wxEnterpriseId);
                 return;
             }
             TabHaobanStaff staff = new TabHaobanStaff();
+            if (!userid.equals(oldStaff.getWxUserId())){
+                //userId可能也会更新
+                staff.setWxUserId(userid);
+            }
             staff.setStaffId(oldStaff.getStaffId());
             staff.setPhoneNumber(qywxCallBackDTO.getMobile());
             staff.setNickName(qywxCallBackDTO.getAlias());
@@ -356,6 +375,14 @@ public class MessageApiServiceImpl implements MessageApiService {
         }
         log.error("成员同步结束");
     }
+    private String getOpenUserid(String userId,WxEnterpriseQwDTO qwDTO) {
+        List<QywxNewUseridDTO> list = qywxUserApiService.useridToOpenuserid(qwDTO.getThirdCorpid(), config.getWxSuiteid(), Collections.singletonList(userId));
+        log.info("明文userId转密文={},{}", userId, JSON.toJSONString(list));
+        if (CollectionUtils.isEmpty(list)) {
+            return "";
+        }
+        return list.get(0).getOpen_userid();
+    }
 
     /**
      * 处理部门

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,8 +530,10 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
                 hmQrcodeService.updateClerkNameByClerkId(enterpriseId, clerkId, clerkDTO.getClerkName(), clerkDTO.getClerkCode());
             } else if (clerkType == 2) {
                 logger.info("区经变更为导购,解绑：{}", clerkId);
-                //解绑
-                staffClerkRelationService.delBind(clerkId, "-1", ChannelCodeEnum.GIC_CLERK_DEL_UNBIND.getCode(), null,null);
+                //解绑,判断当前区经是否开启好办权限，不开启则解绑
+                if (clerkDTO.getEnableHaoban() == null || clerkDTO.getEnableHaoban()==false){
+                    staffClerkRelationService.delBind(clerkId, "-1", ChannelCodeEnum.GIC_CLERK_DEL_UNBIND.getCode(), null,null);
+                }
             }
         }
     }

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

@@ -598,7 +598,7 @@
     			wx_user_id in 
     		</if>
     		<if test="mixFlag==1">
-	    		open_concat_flag in 
+	    		wx_open_user_id in 
     		</if>
     		<foreach collection="wxUserIdList" index="index" item="id" close=")" open="(" separator=",">
     			 #{id}

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

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