Merge branch 'feature/login-token' into developer

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

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

@@ -165,13 +165,15 @@ public interface ExternalClerkRelatedApiService {
     /**
      * 批量查询会员与导购好友关系
      *
-     * @param memberIdList 会员id列表
-     * @param clerkIdList  导购id列表
-     * @param enterpriseId 企业id
-     * @return map:key-会员id value-导购的wxUserId
-     * @author: YongEn
+     * @param memberIdList   会员id列表
+     * @param clerkIdList    导购id列表
+     * @param enterpriseId   企业id
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link Map<String, List<ClerkStaffWxUserDTO>> }
+     * @author mozhu
+     * @date 2021-12-23 15:43:03
      */
-    Map<String, List<ClerkStaffWxUserDTO>> listMemberStaffRel(List<String> memberIdList, List<String> clerkIdList, String enterpriseId);
+    Map<String, List<ClerkStaffWxUserDTO>> listMemberStaffRel(List<String> memberIdList, List<String> clerkIdList, String enterpriseId,String wxEnterpriseId);
 
 
     /**

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

@@ -154,4 +154,20 @@ public interface TabHaobanStaffClerkRelationMapper {
             @Param("memberIdList") List<String> memberIdList,
             @Param("clerkIdList") List<String> clerkIdList,
             @Param("enterpriseId") String enterpriseId);
+
+
+    /**
+     * 批量查询会员与导购关系并且返回关联信息（新企业）
+     *
+     * @param memberIdList 会员id列表
+     * @param clerkIdList  职员id列表
+     * @param enterpriseId 企业标识
+     * @return {@link List<MemberStaffRelExtDO> }
+     * @author mozhu
+     * @date 2021-12-23 15:45:48
+     */
+    List<MemberStaffRelExtDO> listMemberStaffRelNew(
+            @Param("memberIdList") List<String> memberIdList,
+            @Param("clerkIdList") List<String> clerkIdList,
+            @Param("enterpriseId") String enterpriseId);
 }
\ No newline at end of file

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

@@ -62,7 +62,7 @@ import com.github.pagehelper.PageHelper;
  */
 @Service
 public class AuditApiServiceImpl implements AuditApiService{
-	private static Logger logger  = LoggerFactory.getLogger(AuditApiServiceImpl.class);
+	private static final Logger logger  = LoggerFactory.getLogger(AuditApiServiceImpl.class);
 
 	@Autowired
 	private TabHaobanAuditMapper auditMapper;
@@ -390,7 +390,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			String areaId = obj.getAreaId();
 			String storeAddress = obj.getStoreAddress();
 			logger.info("==========================>areaId={},storeAddress={},newValue={}",areaId,storeAddress,newValue);
-			String arr[] = storeAddress.split(" ");
+			String[] arr = storeAddress.split(" ");
 			store.setAreaId(areaId);
 			store.setFullArea(arr[0]);
 			//避免多个空格造成数据混乱
@@ -551,11 +551,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 	public boolean judgeHavePhoneNumberOrCode(String enterpriseId,
 			String clerkCode, String phoneNumber) {
 		List<TabHaobanAudit>  list = auditMapper.judgeHavePhoneNumberOrCode(enterpriseId,clerkCode,phoneNumber);
-		if(CollectionUtil.isEmpty(list)){
-			return false;
-		}else{
-			return true;
-		}
+		return !CollectionUtil.isEmpty(list);
 	}
 	
 }

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

@@ -271,12 +271,23 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
 
     @Override
-    public Map<String, List<ClerkStaffWxUserDTO>> listMemberStaffRel(List<String> memberIdList, List<String> clerkIdList, String enterpriseId) {
+    public Map<String, List<ClerkStaffWxUserDTO>> listMemberStaffRel(List<String> memberIdList, List<String> clerkIdList, String enterpriseId, String wxEnterpriseId) {
         if (CollectionUtils.isEmpty(memberIdList) || CollectionUtils.isEmpty(clerkIdList)) {
             // 2个列表都为空查不了关系
             return Collections.emptyMap();
         }
-        List<MemberStaffRelExtDO> res = staffClerkRelationMapper.listMemberStaffRel(memberIdList, clerkIdList, enterpriseId);
+        TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterriseMapper.selectByPrimaryKey(wxEnterpriseId);
+        if (tabHaobanWxEnterprise == null) {
+            return Collections.emptyMap();
+        }
+        //新老企业兼容
+        String corpid = tabHaobanWxEnterprise.getCorpid();
+        List<MemberStaffRelExtDO> res = new ArrayList<>();
+        if (corpid.length() > 20) {
+            res = staffClerkRelationMapper.listMemberStaffRelNew(memberIdList, clerkIdList, enterpriseId);
+        } else {
+            res = staffClerkRelationMapper.listMemberStaffRel(memberIdList, clerkIdList, enterpriseId);
+        }
         if (CollectionUtils.isEmpty(res)) {
             return Collections.emptyMap();
         }

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

@@ -430,7 +430,14 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("企业为空");
             return false;
         }
-        String userId = relation.getWxUserId();
+        StaffDTO staffDTO = staffApiService.selectById(relation.getStaffId());
+        String corpid = wxEnterprise.getCorpid();
+        String wxUserId = "";
+        if (corpid.length() > 20) {
+            wxUserId = staffDTO.getWxOpenUseId();
+        } else {
+            wxUserId = staffDTO.getWxUserId();
+        }
         QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
         Map<String, String> map = new HashMap<>();
         map.put("事件", "人脸匹配");
@@ -438,13 +445,13 @@ public class MessageApiServiceImpl implements MessageApiService {
         map.put("到店时间", arrivalTime);
         List<ItemDTO> items = getItemsList(map);
         ArrayList<String> list = new ArrayList<>();
-        list.add(userId);
+        list.add(wxUserId);
         messageDTO.setAppid(config.getAppid());
         messageDTO.setUserIds(list);
         messageDTO.setPage(pageUrl);
         messageDTO.setTitle("我的顾客通知");
         messageDTO.setItems(items);
-        return qywxSuiteApiService.sendMessage(wxEnterprise.getCorpid(), config.getWxSuiteid(), messageDTO);
+        return qywxSuiteApiService.sendMessage(corpid, config.getWxSuiteid(), messageDTO);
     }
 
     private List<ItemDTO> getItemsList(Map<String, String> map) {
@@ -477,7 +484,17 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("企业为空");
             return false;
         }
-        String userId = relation.getWxUserId();
+        StaffDTO staffDTO = staffApiService.selectById(relation.getStaffId());
+        if (staffDTO == null) {
+            return false;
+        }
+        String corpId = wxEnterprise.getCorpid();
+        String wxUserId = "";
+        if (corpId.length() > 20) {
+            wxUserId = staffDTO.getWxOpenUseId();
+        } else {
+            wxUserId = staffDTO.getWxUserId();
+        }
         QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
         Map<String, String> map = new HashMap<>();
         map.put("事件", "会员完善标签");
@@ -486,7 +503,7 @@ public class MessageApiServiceImpl implements MessageApiService {
         map.put("消费时间", customerTime);
         List<ItemDTO> items = getItemsList(map);
         ArrayList<String> list = new ArrayList<>();
-        list.add(userId);
+        list.add(wxUserId);
         messageDTO.setAppid(config.getAppid());
         messageDTO.setUserIds(list);
         messageDTO.setPage(pageUrl);

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

@@ -400,4 +400,30 @@
                 </foreach>;
   </select>
 
+
+    <select id="listMemberStaffRelNew" resultType="com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO">
+        select ecr.member_id  as memberId,
+        scr.wx_open_user_id as staffWxUserId,
+        scr.clerk_id as staffClerkId
+        from (select a.staff_id,
+                    b.wx_open_user_id,
+                    a.wx_user_id,
+                    a.clerk_id
+        from tab_haoban_staff_clerk_relation a
+        left join tab_haoban_staff b on a.staff_id = b.staff_id
+        where a.clerk_id in
+        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and a.status_flag = 1
+        group by a.staff_id, a.wx_user_id, a.clerk_id) as scr
+        left join tab_haoban_external_clerk_related as ecr on scr.staff_id = ecr.staff_id
+        where ecr.status_flag = 1
+        and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
+        and ecr.member_id in
+        <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>;
+    </select>
+
 </mapper>
\ No newline at end of file