Merge branch 'feature/01-10' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java

@@ -32,6 +32,8 @@ public class StaffClerkRelationDTO implements Serializable {
     private String storeName;
     private String staffName;
 
+    private String wxOpenUserId;
+
     public String getStaffClerkRelationId() {
         return staffClerkRelationId;
     }
@@ -135,4 +137,12 @@ public class StaffClerkRelationDTO implements Serializable {
     public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
+
+    public String getWxOpenUserId() {
+        return wxOpenUserId;
+    }
+
+    public void setWxOpenUserId(String wxOpenUserId) {
+        this.wxOpenUserId = wxOpenUserId;
+    }
 }

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

@@ -77,6 +77,17 @@ public interface MemberUnionidRelatedApiService {
 	Page<MemberUnionidRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
 														  String enterpriseId, BasePageInfo pageInfo);
 
+	/**
+	 * 群发助手发送企业微信消息
+	 *
+	 * @param wxEnterpriseId
+	 * @param userId
+	 * @param extendUserList
+	 * @param materialId
+	 * @return {@link String }
+	 * @author mozhu
+	 * @date 2022-01-13 10:50:44
+	 */
 	String sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, String materialId);
 
 	/**

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

@@ -56,7 +56,7 @@ public interface TabHaobanStaffClerkRelationMapper {
     void delByStoreIdAndCode( @Param("storeId")String storeId,@Param("clerkCode")String clerkCode);
     
     
-    List<TabHaobanStaffClerkRelation> listByClerkIds(@Param("clerkIds") List<String> clerkIds);
+    List<StaffClerkRelationDTO> listByClerkIds(@Param("clerkIds") List<String> clerkIds);
 
     List<TabHaobanStaffClerkRelation> listByStoreId(@Param("storeId")String storeId);
     

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

@@ -234,10 +234,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList) {
-        if (clerkList == null || clerkList.isEmpty()) {
+        if (CollectionUtils.isEmpty(clerkList)) {
             return Collections.EMPTY_LIST;
         }
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.listByClerkIds(clerkList));
+        return mapper.listByClerkIds(clerkList);
     }
 
     @Override

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

@@ -1357,18 +1357,24 @@ public class StaffApiServiceImpl implements StaffApiService {
     @Override
     public List<String> listBindClerkUserId(String storeId) {
         List<String> userIdList = new ArrayList<String>();
-
         List<String> storeIds = new ArrayList<String>();
         storeIds.add(storeId);
         List<String> clerkList = clerkService.getclerkListByStoreIds(storeIds);
         List<StaffClerkRelationDTO> staffRelationList = staffClerkRelationService.listByClerkIds(clerkList);
+
         Map<String, StaffClerkRelationDTO> clerkIdMap = staffRelationList.stream().filter(s -> s.getClerkId() != null).collect(Collectors.toMap(StaffClerkRelationDTO::getClerkId, s -> s));
         Set<String> keySet = clerkIdMap.keySet();
+        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(staffRelationList.get(0).getWxEnterpriseId());
+        String corpid = wxEnterpriseDTO.getCorpid();
         for (String clerkId : clerkList) {
             if (keySet.contains(clerkId)) {
+                if (corpid.length() > 20) {
+                    userIdList.add(clerkIdMap.get(clerkId).getWxOpenUserId());
+                } else {
                     userIdList.add(clerkIdMap.get(clerkId).getWxUserId());
                 }
             }
+        }
         return userIdList;
     }
 

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

@@ -234,15 +234,10 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
     @Override
     public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds) {
-        if (clerkIds == null || clerkIds.isEmpty()) {
+        if (CollectionUtil.isEmpty(clerkIds)) {
             return Collections.EMPTY_LIST;
         }
-        List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByClerkIds(clerkIds);
-        if (CollectionUtil.isEmpty(list)) {
-            return new ArrayList<StaffClerkRelationDTO>();
-        }
-        List<StaffClerkRelationDTO> result = EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);
-        return result;
+        return tabHaobanStaffClerkRelationMapper.listByClerkIds(clerkIds);
     }
 
     @Override

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

@@ -156,15 +156,18 @@
           and status_flag = 1
     </update>
 
-    <select id="listByClerkIds" resultMap="BaseResultMap" parameterType="java.lang.String">
+    <select id="listByClerkIds" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO" parameterType="java.lang.String">
         select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_staff_clerk_relation
-        where status_flag=1
-        and clerk_id in
+        a.*,
+        b.wx_open_user_id
+        from tab_haoban_staff_clerk_relation a
+        left join tab_haoban_staff b on b.staff_id = a.staff_id
+        where a.status_flag=1
+        and a.clerk_id in
         <foreach collection="clerkIds" item="id" index="index" open="(" close=")" separator=",">
             #{id,jdbcType=VARCHAR}
         </foreach>
+        group by b.staff_id
     </select>
 
     <select id="listByStoreId" resultMap="BaseResultMap" parameterType="java.lang.String">