소스 검색

修改bug

jinshihui 1 개월 전
부모
커밋
07c9906d8e

+ 12 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MomentSimpleDetailVO.java

@@ -42,4 +42,16 @@ public class MomentSimpleDetailVO {
      */
     @ApiModelProperty("媒体URL列表")
     private List<String> mediaUrls;
+
+    /**
+     * 审核状态:1-审核中,2-审核通过,3-审核拒绝
+     */
+    @ApiModelProperty("审核状态:1-审核中,2-审核通过,3-审核拒绝")
+    private Integer auditStatus;
+
+    /**
+     * 审核拒绝原因
+     */
+    @ApiModelProperty("审核拒绝原因")
+    private String rejectReason;
 }

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

@@ -762,11 +762,12 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
             //根据技师姓名查询技师的ID
             LambdaQueryWrapper<TJs> jsQueryWrapper = new LambdaQueryWrapper<>();
             jsQueryWrapper.like(TJs::getcNickName, technicianName);
-            TJs technician = tJsMapper.selectOne(jsQueryWrapper);
-            if (technician == null) {
+            List<TJs> technicians = tJsMapper.selectList(jsQueryWrapper);
+            if (technicians == null || technicians.isEmpty()) {
                 throw new ServiceException("技师不存在");
             }
-            queryWrapper.eq(TechnicianMoment::getTechnicianId, technician.getId());
+            // 构建查询条件,查询所有匹配的技师的动态
+            queryWrapper.in(TechnicianMoment::getTechnicianId, technicians.stream().map(TJs::getId).collect(Collectors.toList()));
         }
 
         // 时间范围查询
@@ -896,6 +897,8 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
         vo.setTitle((String) result.get("title"));
         vo.setContent((String) result.get("content"));
         vo.setMediaType((Integer) result.get("media_type"));
+        vo.setAuditStatus((Integer) result.get("audit_status"));
+        vo.setRejectReason((String) result.get("reject_reason"));
 
         // 4. 处理媒体URL列表
         String mediaUrlsStr = (String) result.get("media_urls");

+ 2 - 0
nightFragrance-massage/src/main/resources/mapper/massage/TechnicianMomentMapper.xml

@@ -97,6 +97,8 @@
             a.title,
             a.content,
             a.media_type,
+            a.audit_status,
+            a.reject_reason,
             GROUP_CONCAT(b.media_url ORDER BY b.sort_order SEPARATOR ',') as media_urls
         FROM
             t_technician_moment a