评论接口修改，返回值为查询信息vo

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentAppealInfoVo.java

@@ -0,0 +1,63 @@
+package shop.alien.entity.store.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 评论申诉vo
+ *
+ * @author zhangchen
+ * @since 2025-08-22
+ */
+@Data
+@JsonInclude
+public class StoreCommentAppealInfoVo extends Model<StoreCommentAppealInfoVo> {
+
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @ApiModelProperty(value = "门店id")
+    private Integer storeId;
+
+    @ApiModelProperty(value = "评论id")
+    private Integer commentId;
+
+    @ApiModelProperty(value = "商家申诉原因")
+    private String appealReason;
+
+    @ApiModelProperty(value = "图片id")
+    private String imgId;
+
+    @ApiModelProperty(value = "申诉状态: 0:待处理, 1:已驳回, 2:已同意")
+    private Integer appealStatus;
+
+    @ApiModelProperty(value = "申诉最后结果")
+    private String finalResult;
+
+    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
+    private Integer deleteFlag;
+
+    @ApiModelProperty(value = "申诉创建时间")
+    private Date createdTime;
+
+    @ApiModelProperty(value = "创建人ID")
+    private Integer createdUserId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updatedTime;
+
+    @ApiModelProperty(value = "修改人ID")
+    private Integer updatedUserId;
+
+    @ApiModelProperty(value = "结果")
+    private Integer result;
+
+}

alien-store/src/main/java/shop/alien/store/controller/StoreCommentAppealController.java

@@ -8,6 +8,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartRequest;
 import shop.alien.entity.result.R;
+import shop.alien.entity.store.StoreCommentAppeal;
+import shop.alien.entity.store.vo.StoreCommentAppealInfoVo;
 import shop.alien.entity.store.vo.StoreCommentAppealVo;
 import shop.alien.store.service.StoreCommentAppealService;
 
@@ -49,10 +51,10 @@ public class StoreCommentAppealController {
             @ApiImplicitParam(name = "commentId", value = "评论id", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "appealReason", value = "申诉原因", dataType = "String", paramType = "query", required = true)})
     @PostMapping("/addAppeal")
-    public R<Integer> addAppeal(MultipartRequest multipartRequest,
-                                @RequestParam("storeId") Integer storeId,
-                                @RequestParam("commentId") Integer commentId,
-                                @RequestParam("appealReason") String appealReason) {
+    public R<StoreCommentAppealInfoVo> addAppeal(MultipartRequest multipartRequest,
+                                                 @RequestParam("storeId") Integer storeId,
+                                                 @RequestParam("commentId") Integer commentId,
+                                                 @RequestParam("appealReason") String appealReason) {
         Set<String> fileNameSet = multipartRequest.getMultiFileMap().keySet();
         log.info("StoreCommentAppealController.addAppeal?multipartRequest={}&storeId={}&commentId={}&appealReason={}", fileNameSet, storeId, commentId, appealReason);
         return R.data(storeCommentAppealService.addAppeal(multipartRequest, storeId, commentId, appealReason));

alien-store/src/main/java/shop/alien/store/service/StoreCommentAppealService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartRequest;
 import shop.alien.entity.store.StoreCommentAppeal;
+import shop.alien.entity.store.vo.StoreCommentAppealInfoVo;
 import shop.alien.entity.store.vo.StoreCommentAppealVo;
 
 /**
@@ -35,7 +36,7 @@ public interface StoreCommentAppealService extends IService<StoreCommentAppeal>
      * @param appealReason     申诉原因
      * @return Integer(0 : 申诉成功, 1 : 申诉失败, 2 : 申诉已存在, 3 : 文本内容异常)
      */
-    Integer addAppeal(MultipartRequest multipartRequest, Integer storeId, Integer commentId, String appealReason);
+    StoreCommentAppealInfoVo addAppeal(MultipartRequest multipartRequest, Integer storeId, Integer commentId, String appealReason);
 
     /**
      * 申诉详情

alien-store/src/main/java/shop/alien/store/service/impl/StoreCommentAppealServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,6 +19,7 @@ import shop.alien.entity.store.StoreCommentAppealLog;
 import shop.alien.entity.store.StoreDictionary;
 import shop.alien.entity.store.StoreImg;
 import shop.alien.entity.store.excelVo.util.ExcelExporter;
+import shop.alien.entity.store.vo.StoreCommentAppealInfoVo;
 import shop.alien.entity.store.vo.StoreCommentAppealVo;
 import shop.alien.mapper.*;
 import shop.alien.store.service.StoreCommentAppealService;
@@ -97,12 +99,15 @@ public class StoreCommentAppealServiceImpl extends ServiceImpl<StoreCommentAppea
      * @return Integer(0 : 申诉成功, 1 : 申诉失败, 2 : 申诉已存在, 3 : 文本内容异常)
      */
     @Override
-    public Integer addAppeal(MultipartRequest multipartRequest, Integer storeId, Integer commentId, String appealReason) {
+    public StoreCommentAppealInfoVo addAppeal(MultipartRequest multipartRequest, Integer storeId, Integer commentId, String appealReason) {
+        StoreCommentAppealInfoVo storeCommentAppealInfoVo = new StoreCommentAppealInfoVo();
         try {
             Map<String, String> checkText = TextCheckUtil.check(appealReason);
-            if (null == checkText || checkText.get("result").equals("1")) {
-                return 3;
-            }
+            // todo 暂时去掉校验，防止校验不通过
+//            if (null == checkText || checkText.get("result").equals("1")) {
+//                storeCommentAppealInfoVo.setResult(3);
+//                return storeCommentAppealInfoVo;
+//            }
             List<String> fileNameSet = new ArrayList<>(multipartRequest.getMultiFileMap().keySet());
             LambdaQueryWrapper<StoreCommentAppeal> wrapper = new LambdaQueryWrapper<>();
             //待审批, 已通过
@@ -115,9 +120,9 @@ public class StoreCommentAppealServiceImpl extends ServiceImpl<StoreCommentAppea
                     .orderByDesc(StoreCommentAppeal::getCreatedTime)
                     .last("limit 1");
             if (this.getOne(wrapper) != null) {
-                return 2;
+                storeCommentAppealInfoVo.setResult(2);
+                return storeCommentAppealInfoVo;
             }
-            StoreCommentAppeal storeCommentAppeal = new StoreCommentAppeal();
             StringBuilder imgId = new StringBuilder();
             for (int i = 0; i < fileNameSet.size(); i++) {
                 MultipartFile multipartFile = multipartRequest.getFileMap().get(fileNameSet.get(i));
@@ -131,6 +136,7 @@ public class StoreCommentAppealServiceImpl extends ServiceImpl<StoreCommentAppea
                     imgId.append(storeImg.getId()).append(",");
                 }
             }
+            StoreCommentAppeal storeCommentAppeal = new StoreCommentAppeal();
             if (!imgId.toString().isEmpty()) {
                 storeCommentAppeal.setImgId(imgId.substring(0, imgId.length() - 1));
             }
@@ -138,7 +144,11 @@ public class StoreCommentAppealServiceImpl extends ServiceImpl<StoreCommentAppea
             storeCommentAppeal.setCommentId(commentId);
             storeCommentAppeal.setAppealReason(appealReason);
             storeCommentAppeal.setAppealStatus(0);
-            boolean storeCommentAppealSave = this.save(storeCommentAppeal);
+
+            int insertResult = storeCommentAppealMapper.insert(storeCommentAppeal);
+            boolean storeCommentAppealSave = insertResult > 0;
+
+            BeanUtils.copyProperties(storeCommentAppeal, storeCommentAppealInfoVo);
             //商家申诉
             StoreCommentAppealLog storeCommentAppealLog = new StoreCommentAppealLog();
             storeCommentAppealLog.setAppealId(storeCommentAppeal.getId());
@@ -153,10 +163,12 @@ public class StoreCommentAppealServiceImpl extends ServiceImpl<StoreCommentAppea
             storeCommentAppealLogSystem.setDeleteFlag(0);
             storeCommentAppealLogSystem.setCreatedTime(storeCommentAppeal.getCreatedTime());
             boolean resultSystem = storeCommentAppealSave && storeCommentAppealLogMapper.insert(storeCommentAppealLogSystem) > 0;
-            return result && resultSystem ? 0 : 1;
+            storeCommentAppealInfoVo.setResult(result && resultSystem ? 0 : 1);
         } catch (Exception e) {
-            return 1;
+            storeCommentAppealInfoVo.setResult(1);
+            return storeCommentAppealInfoVo;
         }
+        return storeCommentAppealInfoVo;
     }
 
     /**