qmj 1 nedēļu atpakaļ
vecāks
revīzija
843caeceb8

+ 21 - 9
ruoyi-system/src/main/java/com/ruoyi/system/controller/PosAppealController.java

@@ -1,6 +1,11 @@
 package com.ruoyi.system.controller;
 package com.ruoyi.system.controller;
 
 
 import java.util.List;
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.utils.JwtUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpServletResponse;
 
 
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Anonymous;
@@ -39,11 +44,15 @@ public class PosAppealController extends BaseController
      * 新增留言信息
      * 新增留言信息
      */
      */
     @Anonymous
     @Anonymous
-//    @Auth
+    @Auth
     @Log(title = "留言信息", businessType = BusinessType.INSERT)
     @Log(title = "留言信息", businessType = BusinessType.INSERT)
     @PostMapping("/apiAdd")
     @PostMapping("/apiAdd")
-    public AjaxResult apiAdd(@RequestBody PosAppeal posAppeal)
+    public AjaxResult apiAdd(@RequestHeader String token,@RequestBody PosAppeal posAppeal)
     {
     {
+        JwtUtil jwtUtil = new JwtUtil();
+        String id = jwtUtil.getusid(token);
+        Long uid=Long.valueOf(id);
+        posAppeal.setUserId(uid);
         PosOrder po = new PosOrder();
         PosOrder po = new PosOrder();
         po.setDdId(posAppeal.getDdId());
         po.setDdId(posAppeal.getDdId());
         List<PosOrder> list = posOrderService.selectPosOrderList(po);
         List<PosOrder> list = posOrderService.selectPosOrderList(po);
@@ -59,15 +68,18 @@ public class PosAppealController extends BaseController
      * 查询留言信息列表
      * 查询留言信息列表
      */
      */
     @Anonymous
     @Anonymous
-//    @Auth
+    @Auth
     @GetMapping("/apiList")
     @GetMapping("/apiList")
-    public AjaxResult list(@RequestParam String ddId, @RequestParam String userType)
+    public AjaxResult list(@RequestHeader String token, @RequestParam Integer page, @RequestParam Integer size)
     {
     {
-        PosAppeal posAppeal = new PosAppeal();
-        posAppeal.setDdId(ddId);
-        posAppeal.setUserType(userType);
-        List<PosAppeal> list = posAppealService.selectPosAppealList(posAppeal);
-        return success(list);
+        JwtUtil jwtUtil = new JwtUtil();
+        String id = jwtUtil.getusid(token);
+        Long uid=Long.valueOf(id);
+        Page<PosAppeal> pageInput=new Page<>(page,size);
+        LambdaQueryWrapper<PosAppeal> query=new LambdaQueryWrapper<>();
+        query.eq(PosAppeal::getUserId,uid);
+        IPage<PosAppeal> result= posAppealService.page(pageInput,query);
+        return success(result);
     }
     }
 
 
     //前端api--end
     //前端api--end

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/PosAppeal.java

@@ -33,6 +33,8 @@ public class PosAppeal
     @Excel(name = "订单号")
     @Excel(name = "订单号")
     private String ddId;
     private String ddId;
 
 
+    private Long userId;
+
     /** 用户类型 */
     /** 用户类型 */
     @Excel(name = "用户类型")
     @Excel(name = "用户类型")
     private String userType;
     private String userType;

+ 6 - 1
ruoyi-system/src/main/resources/mapper/system/PosAppealMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="PosAppeal" id="PosAppealResult">
     <resultMap type="PosAppeal" id="PosAppealResult">
         <result property="id"    column="id"    />
         <result property="id"    column="id"    />
         <result property="ddId"    column="dd_id"    />
         <result property="ddId"    column="dd_id"    />
+        <result property="userId"    column="user_id"    />
         <result property="userType"    column="user_type"    />
         <result property="userType"    column="user_type"    />
         <result property="nickName"    column="nick_name"    />
         <result property="nickName"    column="nick_name"    />
         <result property="content"    column="content"    />
         <result property="content"    column="content"    />
@@ -16,13 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectPosAppealVo">
     <sql id="selectPosAppealVo">
-        select id, dd_id, user_type, nick_name, content, imgs,feed_back,use_case from pos_appeal
+        select id, dd_id, user_id, user_type, nick_name, content, imgs,feed_back,use_case from pos_appeal
     </sql>
     </sql>
 
 
     <select id="selectPosAppealList" parameterType="PosAppeal" resultMap="PosAppealResult">
     <select id="selectPosAppealList" parameterType="PosAppeal" resultMap="PosAppealResult">
         <include refid="selectPosAppealVo"/>
         <include refid="selectPosAppealVo"/>
         <where>  
         <where>  
             <if test="ddId != null "> and dd_id = #{ddId}</if>
             <if test="ddId != null "> and dd_id = #{ddId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userType != null  and userType != ''"> and user_type = #{userType}</if>
             <if test="userType != null  and userType != ''"> and user_type = #{userType}</if>
         </where>
         </where>
         order by dd_id asc,user_type asc,create_time desc
         order by dd_id asc,user_type asc,create_time desc
@@ -37,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into pos_appeal
         insert into pos_appeal
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="ddId != null">dd_id,</if>
             <if test="ddId != null">dd_id,</if>
+            <if test="userId != null">user_id,</if>
             <if test="userType != null">user_type,</if>
             <if test="userType != null">user_type,</if>
             <if test="nickName != null">nick_name,</if>
             <if test="nickName != null">nick_name,</if>
             <if test="content != null">content,</if>
             <if test="content != null">content,</if>
@@ -46,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ddId != null">#{ddId},</if>
             <if test="ddId != null">#{ddId},</if>
+            <if test="userId != null">#{userId},</if>
             <if test="userType != null">#{userType},</if>
             <if test="userType != null">#{userType},</if>
             <if test="nickName != null">#{nickName},</if>
             <if test="nickName != null">#{nickName},</if>
             <if test="content != null">#{content},</if>
             <if test="content != null">#{content},</if>
@@ -59,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update pos_appeal
         update pos_appeal
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="ddId != null">dd_id = #{ddId},</if>
             <if test="ddId != null">dd_id = #{ddId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="userType != null">user_type = #{userType},</if>
             <if test="userType != null">user_type = #{userType},</if>
             <if test="nickName != null">nick_name = #{nickName},</if>
             <if test="nickName != null">nick_name = #{nickName},</if>
             <if test="content != null">content = #{content},</if>
             <if test="content != null">content = #{content},</if>