Procházet zdrojové kódy

feat:投诉记录

caoliqin před 5 dny
rodič
revize
e124171dae

+ 26 - 1
fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseComplaintRecordServiceImpl.java

@@ -1,11 +1,18 @@
 package com.fs.course.service.impl;
 
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.course.param.UserCourseComplaintRecordParam;
 import com.fs.course.vo.FsUserCourseComplaintRecordPageListVO;
+import com.fs.qw.domain.QwExternalContact;
+import com.fs.qw.mapper.QwExternalContactMapper;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.course.mapper.FsUserCourseComplaintRecordMapper;
 import com.fs.course.domain.FsUserCourseComplaintRecord;
@@ -20,6 +27,9 @@ import com.fs.course.service.IFsUserCourseComplaintRecordService;
 @Service
 public class FsUserCourseComplaintRecordServiceImpl extends ServiceImpl<FsUserCourseComplaintRecordMapper, FsUserCourseComplaintRecord> implements IFsUserCourseComplaintRecordService {
 
+    @Autowired
+    private QwExternalContactMapper qwExternalContactMapper;
+
     /**
      * 查询看课投诉记录
      *
@@ -41,7 +51,22 @@ public class FsUserCourseComplaintRecordServiceImpl extends ServiceImpl<FsUserCo
     @Override
     public List<FsUserCourseComplaintRecordPageListVO> selectFsUserCourseComplaintRecordList(FsUserCourseComplaintRecord fsUserCourseComplaintRecord)
     {
-        return baseMapper.selectFsUserCourseComplaintRecordPageList(fsUserCourseComplaintRecord);
+        List<FsUserCourseComplaintRecordPageListVO> list = baseMapper.selectFsUserCourseComplaintRecordPageList(fsUserCourseComplaintRecord);
+
+        // 获取外部联系人看课状态
+        List<Long> userIds = list.stream().map(FsUserCourseComplaintRecordPageListVO::getUserId).collect(Collectors.toList());
+        List<QwExternalContact> qwExternalContacts = qwExternalContactMapper.selectExternalByFsUserIds(userIds);
+        Map<Long, QwExternalContact> qwExternalContactMap = qwExternalContacts.stream().collect(Collectors.toMap(QwExternalContact::getFsUserId, Function.identity(), (v1, v2) -> v1));
+
+        for (FsUserCourseComplaintRecordPageListVO vo : list) {
+            QwExternalContact contact = qwExternalContactMap.get(vo.getUserId());
+            if(contact != null) {
+                vo.setStatus(contact.getCommentStatus() != null && contact.getCommentStatus() == 1 ? "已拉黑" : "正常");
+            } else {
+                vo.setStatus("正常");
+            }
+        }
+        return list;
     }
 
     /**

+ 2 - 0
fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -404,4 +404,6 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
     @Select("select sum(amount) as redPacketAmount from fs_course_red_packet_log where user_id = #{userId}")
     BigDecimal getRedPacketAmount(@Param("userId") Long userId);
 
+    List<QwExternalContact> selectExternalByFsUserIds(@Param("userIds")List<Long> userIds);
+
 }

+ 3 - 3
fs-service/src/main/resources/mapper/course/FsUserCourseComplaintRecordMapper.xml

@@ -36,15 +36,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ct.complaint_type_name,
         uc.course_name,
         ucv.title,
-        fs_user.nick_name,
-        if(ec.comment_status = 1,'已拉黑','正常') as status
+        fs_user.nick_name
+--         if(ec.comment_status = 1,'已拉黑','正常') as status
         FROM
         fs_user_course_complaint_record cr
         LEFT JOIN fs_user_course_complaint_type ct ON ct.complaint_type_id = cr.complaint_type_id
         LEFT JOIN fs_user_course uc ON uc.course_id = cr.course_id
         LEFT JOIN fs_user_course_video ucv ON ucv.video_id = cr.video_id
         LEFT JOIN fs_user ON fs_user.user_id = cr.user_id
-        left join qw_external_contact ec on cr.user_id = ec.fs_user_id
+--         left join qw_external_contact ec on cr.user_id = ec.fs_user_id
         <where>
             <if test="nickName != null and nickName != '' ">
                 and fs_user.nick_name like concat('%', #{nickName}, '%')

+ 8 - 0
fs-service/src/main/resources/mapper/qw/QwExternalContactMapper.xml

@@ -572,4 +572,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <select id="selectExternalByFsUserIds" resultType="QwExternalContact">
+        select * from qw_external_contact
+        where fs_user_id in
+        <foreach collection="userIds" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </select>
+
 </mapper>