开发动态相关的接口

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TechnicianMomentController.java

@@ -282,15 +282,15 @@ public class TechnicianMomentController extends BaseController {
      */
     @GetMapping("/drafts")
     @ApiOperation("查询草稿箱列表")
-    public R<List<MomentListVO>> getDraftMoments(@ApiParam("页码") @RequestParam(defaultValue = "1") Integer pageNum, @ApiParam("每页数量") @RequestParam(defaultValue = "10") Integer pageSize) {
+    public R<Page<MomentListVO>> getDraftMoments(@ApiParam("页码") @RequestParam(defaultValue = "1") Integer pageNum, @ApiParam("每页数量") @RequestParam(defaultValue = "10") Integer pageSize) {
         try {
             // 获取当前登录用户信息
             WxLoginUser wxLoginUser = getWxLoginUser();
             String openId = wxLoginUser.getCOpenid();
             log.info("查询草稿箱列表，openId：{}", openId);
 
-            List<MomentListVO> list = momentService.getDraftMoments(openId, pageNum, pageSize);
-            return R.ok(list);
+            Page<MomentListVO> draftMoments = momentService.getDraftMoments(openId, pageNum, pageSize);
+            return R.ok(draftMoments);
         } catch (Exception e) {
             log.error("查询草稿箱列表失败", e);
             return R.fail("查询草稿箱列表失败：" + e.getMessage());

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MomentListVO.java

@@ -35,6 +35,11 @@ public class MomentListVO {
     @ApiModelProperty("动态标题")
     private String title;
 
+    /**
+     * 动态内容
+     */
+    private String content;
+
     /**
      * 封面图URL
      * 动态封面图片的访问地址，默认取第一张图片或视频封面图
@@ -87,6 +92,16 @@ public class MomentListVO {
     @ApiModelProperty("技师状态:1-可服务,2-可预约")
     private Integer technicianStatus;
 
+    /**
+     * 审核状态:0-草稿,1-待审核,2-审核通过,3-审核拒绝
+     */
+    private Integer auditStatus;
+
+    /**
+     * 拒绝原因
+     */
+    private String rejectReason;
+
     /**
      * 距离
      * 用户与动态发布位置的距离，单位：千米(km)

nightFragrance-massage/src/main/java/com/ylx/massage/service/ITechnicianMomentService.java

@@ -82,7 +82,7 @@ public interface ITechnicianMomentService extends IService<com.ylx.massage.domai
      * @param pageSize 每页数量
      * @return 草稿列表
      */
-    List<MomentListVO> getDraftMoments(String openId, Integer pageNum, Integer pageSize);
+    Page<MomentListVO> getDraftMoments(String openId, Integer pageNum, Integer pageSize);
 
     /**
      * 查询我的动态列表（已发布的动态：审核中+审核通过）

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TechnicianMomentServiceImpl.java

@@ -573,7 +573,7 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
      * @return List<MomentListVO> 草稿列表
      */
     @Override
-    public List<MomentListVO> getDraftMoments(String openId, Integer pageNum, Integer pageSize) {
+    public Page<MomentListVO> getDraftMoments(String openId, Integer pageNum, Integer pageSize) {
         if (openId == null || openId.trim().isEmpty()) {
             throw new ServiceException("openId不能为空");
         }
@@ -596,12 +596,14 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
 
         Page<TechnicianMoment> momentPage = momentMapper.selectPage(page, momentWrapper);
         List<TechnicianMoment> moments = momentPage.getRecords();
+        Page<MomentListVO> voPage = new Page<>(pageNum, pageSize);
         if (moments == null || moments.isEmpty()) {
-            return new ArrayList<>();
+            // 草稿列表为空时，返回空Page对象
+            return voPage;
         }
 
         // 3. 组装VO
-        return moments.stream().map(moment -> {
+        List<MomentListVO> collect = moments.stream().map(moment -> {
             MomentListVO vo = new MomentListVO();
             BeanUtils.copyProperties(moment, vo);
             vo.setTechnicianNickName(technician.getcNickName());
@@ -611,6 +613,11 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
             vo.setPublishTime(moment.getCreateTime());
             return vo;
         }).collect(Collectors.toList());
+        //返回Page对象
+
+        voPage.setTotal(momentPage.getTotal());
+        voPage.setRecords(collect);
+        return voPage;
     }
 
     /**