Merge branch 'feature/xgh/7月零散' into 'developer'

成长值

See merge request !2070

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * 会员加群、好友信息
+ */
+public class MemberGroupFriendDTO implements Serializable {
+    // 0好友 1群
+    private int type ;
+
+    private String clerkId ;
+    private String storeId ;
+    private Long groupChatId ;
+
+    private String remark ;
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getGroupChatId() {
+        return groupChatId;
+    }
+
+    public void setGroupChatId(Long groupChatId) {
+        this.groupChatId = groupChatId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

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

@@ -343,5 +343,13 @@ public interface ExternalClerkRelatedApiService {
 
     ExternalClerkRelatedDTO getDelFriend(String wxEnterpriseId , String enterpriseId , String staffId) ;
 
+    /**
+     * 判断会员是否加过好友
+     * @param enterpriseId
+     * @param memberId
+     * @return
+     */
+    public com.gic.api.base.commons.ServiceResponse<MemberGroupFriendDTO> memberIsAddClerk(String enterpriseId, String memberId) ;
+
 
 }

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.MemberGroupFriendDTO;
 import com.gic.haoban.manage.api.dto.chat.ChatEventDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerDTO;
@@ -173,4 +174,12 @@ public interface GroupChatApiService {
      */
     public List<String> listOpenGroupChatDK(String enterpriseId , String staffId) ;
 
+    /**
+     * 判断会员是否入群
+     * @param enterpriseId
+     * @param memberId
+     * @return
+     */
+    public ServiceResponse<MemberGroupFriendDTO> memberIsAddGroup(String enterpriseId, String memberId) ;
+
 }

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

@@ -76,4 +76,5 @@ public interface GroupChatUserMapper {
      */
     List<UserQuitBO> listQuitNum(@Param("wxEnterpriseId") String wxEnterpriseId ,@Param("start") Date start ,@Param("end") Date end) ;
 
+    List<TabGroupChatUser> getByMember(@Param("enterpriseId")String enterpriseId, @Param("memberId")String memberId);
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatUser;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatUserBO;
 
 import java.util.List;
@@ -16,4 +17,14 @@ public interface GroupChatUserService {
      * 查询群组内群成员
      */
     List<GroupChatUserBO> queryGroupMemberWithChatId(String enterpriseId, String wxEnterpriseId, Long groupChatId);
+
+
+    /**
+     * 判断会员是否进过群
+     * @param enterpriseId
+     * @param memberId
+     * @return
+     */
+    List<TabGroupChatUser> getByMember(String enterpriseId , String memberId) ;
+
 }
\ No newline at end of file

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

@@ -67,4 +67,9 @@ public class GroupChatUserServiceImpl implements GroupChatUserService {
                 })
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public  List<TabGroupChatUser> getByMember(String enterpriseId, String memberId) {
+        return this.groupChatUserMapper.getByMember(enterpriseId,memberId);
+    }
 }
\ No newline at end of file

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

@@ -866,5 +866,24 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         return retPage;
     }
 
-
+    @Override
+    public com.gic.api.base.commons.ServiceResponse<MemberGroupFriendDTO> memberIsAddClerk(String enterpriseId, String memberId) {
+        List<TabHaobanExternalClerkRelated> list = this.externalClerkRelatedService.getAddTimeByMemberId(memberId,enterpriseId,"1") ;
+        if(CollectionUtils.isNotEmpty(list)) {
+            TabHaobanExternalClerkRelated item = list.get(0) ;
+            MemberGroupFriendDTO dto = new MemberGroupFriendDTO() ;
+            dto.setType(0);
+            String storeId = item.getStoreId() ;
+            String clerkId = item.getClerkId() ;
+            ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+            StoreDTO storeDTO = storeService.getStore(storeId);
+            if(clerkDTO != null && null != storeDTO) {
+                dto.setStoreId(storeId);
+                dto.setClerkId(clerkId);
+                dto.setRemark(clerkDTO.getClerkName()+"("+clerkDTO.getClerkCode()+") , " + storeDTO.getStoreName()+"("+storeDTO.getStoreCode()+")");
+                return com.gic.api.base.commons.ServiceResponse.success(dto) ;
+            }
+        }
+        return com.gic.api.base.commons.ServiceResponse.success(null) ;
+    }
 }

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

@@ -10,10 +10,11 @@ import java.util.stream.Collectors;
 
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.manage.api.dto.MemberGroupFriendDTO;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanClerkMainStoreRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatMapper;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatUserMapper;
-import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChat;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatUser;
 import org.apache.commons.collections.CollectionUtils;
@@ -41,9 +42,6 @@ import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
-import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
-import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatBO;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.StaffService;
@@ -320,4 +318,23 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
     public List<String> listOpenGroupChatDK(String enterpriseId, String staffId) {
         return this.groupChatMapper.listOpenGroupChatDK(enterpriseId,staffId);
     }
+
+    @Override
+    public ServiceResponse<MemberGroupFriendDTO> memberIsAddGroup(String enterpriseId, String memberId) {
+        List<TabGroupChatUser> list = this.groupChatUserService.getByMember(enterpriseId,memberId) ;
+        if(CollectionUtils.isNotEmpty(list)) {
+            logger.info("会员入群数={}",memberId,list.size());
+            TabGroupChatUser item = list.get(0) ;
+            MemberGroupFriendDTO dto = new MemberGroupFriendDTO() ;
+            dto.setType(1);
+            Long groupChatId = item.getGroupChatId() ;
+            TabGroupChat group = this.groupChatMapper.selectById(groupChatId) ;
+            if(null != group) {
+                dto.setGroupChatId(groupChatId);
+                dto.setRemark(group.getName()+"("+groupChatId+")");
+                return ServiceResponse.success(dto);
+            }
+        }
+        return ServiceResponse.success(null);
+    }
 }

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

@@ -896,6 +896,7 @@
         <if test="null != flag">
             and status_flag in (1)
         </if>
+        order by create_time desc
     </select>
 
     <select id="getMemberIdByExternalId"  resultType="java.lang.String">

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatUserMapper.xml

@@ -315,4 +315,10 @@
 			and delete_flag = 0 and status_flag = 1 limit 1
 	</select>
 
+
+	<select id="getByMember" resultMap="result-map-tabHaobanGroupChatUser">
+		select <include refid="Base_Column_List"/> from tab_haoban_group_chat_user where enterprise_id = #{enterpriseId}
+		and member_id = #{memberId} and status_flag = 1  and delete_flag = 0 order by create_time desc
+	</select>
+
 </mapper> 
\ No newline at end of file