投诉

fs-admin/src/main/java/com/fs/user/controller/FsUserComplaintController.java

@@ -1,6 +1,9 @@
 package com.fs.user.controller;
 
 import java.util.List;
+
+import com.fs.user.domain.param.FsUserComplaintParam;
+import com.fs.user.domain.vo.FsUserComplaintVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,7 +25,7 @@ import com.fs.common.core.page.TableDataInfo;
 
 /**
  * 用户投诉Controller
- * 
+ *
  * @author fs
  * @date 2025-08-27
  */
@@ -37,11 +40,11 @@ public class FsUserComplaintController extends BaseController
      * 查询用户投诉列表
      */
     @PreAuthorize("@ss.hasPermi('user:complaint:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsUserComplaint fsUserComplaint)
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody FsUserComplaintParam param)
     {
         startPage();
-        List<FsUserComplaint> list = fsUserComplaintService.selectFsUserComplaintList(fsUserComplaint);
+        List<FsUserComplaintVo> list = fsUserComplaintService.selectFsUserComplaintVoList(param);
         return getDataTable(list);
     }
 

fs-company/src/main/resources/application.yml

@@ -11,4 +11,4 @@ spring:
 #    active: druid-yzt
 #    active: druid-myhk
 #    active: druid-sft
-    active: dev
+    active: dev-yjb

fs-service/src/main/java/com/fs/user/domain/FsUserComplaint.java

@@ -20,7 +20,6 @@ public class FsUserComplaint extends BaseEntity{
     private Long id;
 
     /** 投诉用户 */
-    @Excel(name = "投诉用户")
     private Long fsUserId;
 
     /** 投诉标题 */
@@ -35,6 +34,10 @@ public class FsUserComplaint extends BaseEntity{
     @Excel(name = "投诉图片")
     private String images;
 
+    /** 投诉方式 1咨询 2投诉/举报” */
+    @Excel(name = "投诉方式 1咨询 2投诉/举报")
+    private Integer complaintType;
+
     /** 投诉类型0默认1店铺2商品 */
     @Excel(name = "投诉类型0默认1店铺2商品")
     private Long type;
@@ -43,5 +46,25 @@ public class FsUserComplaint extends BaseEntity{
     @Excel(name = "关联ID")
     private Long linkId;
 
+    /** 商家是否处理 0:否 1:是 */
+    @Excel(name = "商家是否处理 0:否 1:是")
+    private Integer isHandleStore;
+
+    /** 平台是否处理 0:否 1:是 */
+    @Excel(name = "平台是否处理 0:否 1:是")
+    private Integer isHandlePlatform;
+
+    /** 用户是否有未读消息 0:否 1:是 */
+    @Excel(name = "用户是否有未读消息 0:否 1:是")
+    private Integer isReadUser;
+
+    /** 商家是否有未读消息 0:否 1:是 */
+    @Excel(name = "用户是否有未读消息 0:否 1:是 ")
+    private Integer isReadStore;
+
+    /** 平台是否有未读消息 0:否 1:是 */
+    @Excel(name = "用户是否有未读消息 0:否 1:是 ")
+    private Integer isReadPlatform;
+
 
 }

fs-service/src/main/java/com/fs/user/domain/param/FsUserComplaintParam.java

@@ -0,0 +1,9 @@
+package com.fs.user.domain.param;
+
+import com.fs.user.domain.FsUserComplaint;
+import lombok.Data;
+
+@Data
+public class FsUserComplaintParam extends FsUserComplaint {
+    private String userName;
+}

fs-service/src/main/java/com/fs/user/domain/vo/FsUserComplaintVo.java

@@ -0,0 +1,11 @@
+package com.fs.user.domain.vo;
+
+import com.fs.common.annotation.Excel;
+import com.fs.user.domain.FsUserComplaint;
+import lombok.Data;
+
+@Data
+public class FsUserComplaintVo extends FsUserComplaint {
+    @Excel(name = "用户")
+    private String nickName;
+}

fs-service/src/main/java/com/fs/user/mapper/FsUserComplaintMapper.java

@@ -3,17 +3,19 @@ package com.fs.user.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.user.domain.FsUserComplaint;
+import com.fs.user.domain.param.FsUserComplaintParam;
+import com.fs.user.domain.vo.FsUserComplaintVo;
 
 /**
  * 用户投诉Mapper接口
- * 
+ *
  * @author fs
  * @date 2025-08-27
  */
 public interface FsUserComplaintMapper extends BaseMapper<FsUserComplaint>{
     /**
      * 查询用户投诉
-     * 
+     *
      * @param id 用户投诉主键
      * @return 用户投诉
      */
@@ -21,15 +23,16 @@ public interface FsUserComplaintMapper extends BaseMapper<FsUserComplaint>{
 
     /**
      * 查询用户投诉列表
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 用户投诉集合
      */
     List<FsUserComplaint> selectFsUserComplaintList(FsUserComplaint fsUserComplaint);
+    List<FsUserComplaintVo> selectFsUserComplaintVoList(FsUserComplaintParam param);
 
     /**
      * 新增用户投诉
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 结果
      */
@@ -37,7 +40,7 @@ public interface FsUserComplaintMapper extends BaseMapper<FsUserComplaint>{
 
     /**
      * 修改用户投诉
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 结果
      */
@@ -45,7 +48,7 @@ public interface FsUserComplaintMapper extends BaseMapper<FsUserComplaint>{
 
     /**
      * 删除用户投诉
-     * 
+     *
      * @param id 用户投诉主键
      * @return 结果
      */
@@ -53,7 +56,7 @@ public interface FsUserComplaintMapper extends BaseMapper<FsUserComplaint>{
 
     /**
      * 批量删除用户投诉
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

fs-service/src/main/java/com/fs/user/service/IFsUserComplaintService.java

@@ -3,17 +3,19 @@ package com.fs.user.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.user.domain.FsUserComplaint;
+import com.fs.user.domain.param.FsUserComplaintParam;
+import com.fs.user.domain.vo.FsUserComplaintVo;
 
 /**
  * 用户投诉Service接口
- * 
+ *
  * @author fs
  * @date 2025-08-27
  */
 public interface IFsUserComplaintService extends IService<FsUserComplaint>{
     /**
      * 查询用户投诉
-     * 
+     *
      * @param id 用户投诉主键
      * @return 用户投诉
      */
@@ -21,15 +23,18 @@ public interface IFsUserComplaintService extends IService<FsUserComplaint>{
 
     /**
      * 查询用户投诉列表
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 用户投诉集合
      */
     List<FsUserComplaint> selectFsUserComplaintList(FsUserComplaint fsUserComplaint);
 
+
+    List<FsUserComplaintVo> selectFsUserComplaintVoList(FsUserComplaintParam param);
+
     /**
      * 新增用户投诉
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 结果
      */
@@ -37,7 +42,7 @@ public interface IFsUserComplaintService extends IService<FsUserComplaint>{
 
     /**
      * 修改用户投诉
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 结果
      */
@@ -45,7 +50,7 @@ public interface IFsUserComplaintService extends IService<FsUserComplaint>{
 
     /**
      * 批量删除用户投诉
-     * 
+     *
      * @param ids 需要删除的用户投诉主键集合
      * @return 结果
      */
@@ -53,9 +58,10 @@ public interface IFsUserComplaintService extends IService<FsUserComplaint>{
 
     /**
      * 删除用户投诉信息
-     * 
+     *
      * @param id 用户投诉主键
      * @return 结果
      */
     int deleteFsUserComplaintById(Long id);
+
 }

fs-service/src/main/java/com/fs/user/service/impl/FsUserComplaintServiceImpl.java

@@ -3,7 +3,8 @@ package com.fs.user.service.impl;
 import java.util.List;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.fs.user.domain.param.FsUserComplaintParam;
+import com.fs.user.domain.vo.FsUserComplaintVo;
 import org.springframework.stereotype.Service;
 import com.fs.user.mapper.FsUserComplaintMapper;
 import com.fs.user.domain.FsUserComplaint;
@@ -11,7 +12,7 @@ import com.fs.user.service.IFsUserComplaintService;
 
 /**
  * 用户投诉Service业务层处理
- * 
+ *
  * @author fs
  * @date 2025-08-27
  */
@@ -20,7 +21,7 @@ public class FsUserComplaintServiceImpl extends ServiceImpl<FsUserComplaintMappe
 
     /**
      * 查询用户投诉
-     * 
+     *
      * @param id 用户投诉主键
      * @return 用户投诉
      */
@@ -32,7 +33,7 @@ public class FsUserComplaintServiceImpl extends ServiceImpl<FsUserComplaintMappe
 
     /**
      * 查询用户投诉列表
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 用户投诉
      */
@@ -42,22 +43,39 @@ public class FsUserComplaintServiceImpl extends ServiceImpl<FsUserComplaintMappe
         return baseMapper.selectFsUserComplaintList(fsUserComplaint);
     }
 
+    /**
+     * 查询用户投诉列表
+     *
+     * @param param 用户投诉
+     * @return 用户投诉
+     */
+    @Override
+    public List<FsUserComplaintVo> selectFsUserComplaintVoList(FsUserComplaintParam param)
+    {
+        return baseMapper.selectFsUserComplaintVoList(param);
+    }
+
     /**
      * 新增用户投诉
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 结果
      */
     @Override
     public int insertFsUserComplaint(FsUserComplaint fsUserComplaint)
     {
+        fsUserComplaint.setIsHandleStore(0);
+        fsUserComplaint.setIsHandlePlatform(0);
+        fsUserComplaint.setIsReadUser(0);
+        fsUserComplaint.setIsReadStore(1);
+        fsUserComplaint.setIsReadPlatform(1);
         fsUserComplaint.setCreateTime(DateUtils.getNowDate());
         return baseMapper.insertFsUserComplaint(fsUserComplaint);
     }
 
     /**
      * 修改用户投诉
-     * 
+     *
      * @param fsUserComplaint 用户投诉
      * @return 结果
      */
@@ -70,7 +88,7 @@ public class FsUserComplaintServiceImpl extends ServiceImpl<FsUserComplaintMappe
 
     /**
      * 批量删除用户投诉
-     * 
+     *
      * @param ids 需要删除的用户投诉主键
      * @return 结果
      */
@@ -82,7 +100,7 @@ public class FsUserComplaintServiceImpl extends ServiceImpl<FsUserComplaintMappe
 
     /**
      * 删除用户投诉信息
-     * 
+     *
      * @param id 用户投诉主键
      * @return 结果
      */

fs-service/src/main/resources/mapper/user/FsUserComplaintMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.user.mapper.FsUserComplaintMapper">
-    
+
     <resultMap type="FsUserComplaint" id="FsUserComplaintResult">
         <result property="id"    column="id"    />
         <result property="fsUserId"    column="fs_user_id"    />
@@ -17,29 +17,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="remark"    column="remark"    />
+        <result property="complaintType"    column="complaint_type"    />
+        <result property="isHandleStore"    column="is_handle_store"    />
+        <result property="isHandlePlatform"    column="is_handle_platform"    />
+        <result property="isReadUser"    column="is_read_user"    />
+        <result property="isReadStore"    column="is_read_store"    />
+        <result property="isReadPlatform"    column="is_read_platform"    />
     </resultMap>
 
     <sql id="selectFsUserComplaintVo">
-        select id, fs_user_id, title, content, images, type, link_id, create_time, create_by, update_time, update_by, remark from fs_user_complaint
+        select id, fs_user_id, title, content, images, type, link_id, create_time, create_by, update_time, update_by,
+               remark,complaint_type,is_handle_store,is_handle_platform,is_read_user,is_read_store,is_read_platform
+        from fs_user_complaint
     </sql>
 
     <select id="selectFsUserComplaintList" parameterType="FsUserComplaint" resultMap="FsUserComplaintResult">
         <include refid="selectFsUserComplaintVo"/>
-        <where>  
+        <where>
             <if test="fsUserId != null "> and fs_user_id = #{fsUserId}</if>
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="images != null  and images != ''"> and images = #{images}</if>
             <if test="type != null "> and type = #{type}</if>
             <if test="linkId != null "> and link_id = #{linkId}</if>
+            <if test="complaintType != null "> and complaint_type = #{complaintType}</if>
+            <if test="isHandleStore != null "> and is_handle_store = #{isHandleStore}</if>
+            <if test="isHandlePlatform != null "> and is_handle_platform = #{isHandlePlatform}</if>
+            <if test="isReadUser != null "> and is_read_user = #{isReadUser}</if>
+            <if test="isReadStore != null "> and is_read_store = #{isReadStore}</if>
+            <if test="isReadPlatform != null "> and is_read_platform = #{isReadPlatform}</if>
+        </where>
+        order by id desc
+    </select>
+
+    <select id="selectFsUserComplaintVoList" resultType="com.fs.user.domain.vo.FsUserComplaintVo">
+        select c.id, u.nick_name,c.title, c.content, c.images, c.type, c.link_id, c.create_time, c.create_by, c.update_time, c.update_by,
+               c.remark,c.complaint_type,c.is_handle_store,c.is_handle_platform,c.is_read_user,c.is_read_store,c.is_read_platform
+        from fs_user_complaint c
+        left join fs_user u on c.fs_user_id = u.user_id
+        <where>
+            <if test="fsUserId != null "> and c.fs_user_id = #{fsUserId}</if>
+            <if test="userName != null and userName != ''"> and u.nick_name = #{userName}</if>
+            <if test="title != null  and title != ''"> and c.title = #{title}</if>
+            <if test="content != null  and content != ''"> and c.content = #{content}</if>
+            <if test="images != null  and images != ''"> and c.images = #{images}</if>
+            <if test="type != null "> and c.type = #{type}</if>
+            <if test="linkId != null "> and c.link_id = #{linkId}</if>
+            <if test="complaintType != null "> and c.complaint_type = #{complaintType}</if>
+            <if test="isHandleStore != null "> and c.is_handle_store = #{isHandleStore}</if>
+            <if test="isHandlePlatform != null "> and c.is_handle_platform = #{isHandlePlatform}</if>
+            <if test="isReadUser != null "> and c.is_read_user = #{isReadUser}</if>
+            <if test="isReadStore != null "> and c.is_read_store = #{isReadStore}</if>
+            <if test="isReadPlatform != null "> and c.is_read_platform = #{isReadPlatform}</if>
         </where>
+        order by id desc
     </select>
-    
+
     <select id="selectFsUserComplaintById" parameterType="Long" resultMap="FsUserComplaintResult">
         <include refid="selectFsUserComplaintVo"/>
         where id = #{id}
     </select>
-        
+
+
     <insert id="insertFsUserComplaint" parameterType="FsUserComplaint" useGeneratedKeys="true" keyProperty="id">
         insert into fs_user_complaint
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -54,6 +93,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="remark != null">remark,</if>
+            <if test="complaintType != null">complaint_type,</if>
+            <if test="isHandleStore != null">is_handle_store,</if>
+            <if test="isHandlePlatform != null">is_handle_platform,</if>
+            <if test="isReadUser != null">is_read_user,</if>
+            <if test="isReadStore != null">is_read_store,</if>
+            <if test="isReadPlatform != null">is_read_platform,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fsUserId != null">#{fsUserId},</if>
@@ -67,6 +112,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="complaintType != null">#{complaintType},</if>
+            <if test="isHandleStore != null">#{isHandleStore},</if>
+            <if test="isHandlePlatform != null">#{isHandlePlatform},</if>
+            <if test="isReadUser != null">#{isReadUser},</if>
+            <if test="isReadStore != null">#{isReadStore},</if>
+            <if test="isReadPlatform != null">#{isReadPlatform},</if>
          </trim>
     </insert>
 
@@ -84,6 +135,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="complaintType != null">complaint_type = #{complaintType},</if>
+            <if test="isHandleStore != null">is_handle_store = #{isHandleStore},</if>
+            <if test="isHandlePlatform != null">is_handle_platform = #{isHandlePlatform},</if>
+            <if test="isReadUser != null">is_read_user = #{isReadUser},</if>
+            <if test="isReadStore != null">is_read_store = #{isReadStore},</if>
+            <if test="isReadPlatform != null">is_read_platform = #{isReadPlatform},</if>
         </trim>
         where id = #{id}
     </update>
@@ -93,9 +150,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteFsUserComplaintByIds" parameterType="String">
-        delete from fs_user_complaint where id in 
+        delete from fs_user_complaint where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

fs-user-app/src/main/java/com/fs/app/controller/store/FsUserComplaintController.java

@@ -1,5 +1,6 @@
 package com.fs.app.controller.store;
 
+import com.fs.app.controller.AppBaseController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
@@ -22,7 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/store/app/user/complaint")
-public class FsUserComplaintController extends BaseController
+public class FsUserComplaintController extends AppBaseController
 {
     @Autowired
     private IFsUserComplaintService fsUserComplaintService;
@@ -66,6 +67,10 @@ public class FsUserComplaintController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsUserComplaint fsUserComplaint)
     {
+        if (fsUserComplaint.getFsUserId() == null || fsUserComplaint.getFsUserId() == 0) {
+            String userId = getUserId();
+            fsUserComplaint.setFsUserId(Long.parseLong(userId));
+        }
         return toAjax(fsUserComplaintService.insertFsUserComplaint(fsUserComplaint));
     }