2 次代码提交 044c46c7e8 ... 36c1002ada

作者 SHA1 备注 提交日期
  jinshihui 36c1002ada Merge remote-tracking branch 'origin/dev' into dev 1 月之前
  jinshihui 7c62dce46f 修改bug 1 月之前

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

@@ -326,8 +326,6 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
                     if (StringUtils.isBlank(dto.getVideoUrl())) {
                         throw new ServiceException("视频不能为空");
                     }
-                } else {
-                    throw new ServiceException("媒体类型不正确");
                 }
             }
         }
@@ -352,7 +350,7 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
                     moment.setCoverUrl(dto.getImageUrls().get(0));
                 }
             } else if (dto.getMediaType() == 2) {
-                // 视频类型,使用视频URL作为封面
+                // 视频类型,使用视频封面URL作为封面
                 moment.setCoverUrl(dto.getVideoCoverUrl());
             }
         }

+ 3 - 0
nightFragrance-massage/src/main/java/com/ylx/project/domain/Project.java

@@ -22,6 +22,9 @@ public class Project extends BaseEntity {
     @ApiModelProperty("服务标签(1:按摩 2:陪玩)")
     private Integer type;
 
+    /**
+     * 服务类目ID
+     */
     @ApiModelProperty("服务类目ID")
     private Integer categoryId;
 

+ 2 - 2
nightFragrance-massage/src/main/java/com/ylx/project/domain/dto/ProjectSearchDTO.java

@@ -18,9 +18,9 @@ public class ProjectSearchDTO implements Serializable {
     private String title;
 
     /**
-     * 状态: 0=上架, 1=下架
+     * 是否上下架: 0=上架, 1=下架
      */
-    @ApiModelProperty("状态: 0=上架, 1=下架")
+    @ApiModelProperty("是否上下架: 0=上架, 1=下架")
     private Integer status;
 
     /**

+ 2 - 2
nightFragrance-massage/src/main/java/com/ylx/project/service/impl/ProjectServiceImpl.java

@@ -84,7 +84,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (StringUtils.isNotBlank(dto.getTitle())) {
             queryWrapper.like(Project::getTitle, dto.getTitle());
         }
-        // 状态
+        // 上下架状态
         if (ObjectUtil.isNotEmpty(dto.getStatus())) {
             queryWrapper.eq(Project::getStatus, dto.getStatus());
         }
@@ -92,7 +92,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (ObjectUtil.isNotEmpty(dto.getCategoryId())) {
             queryWrapper.eq(Project::getCategoryId, dto.getCategoryId());
         }
-        queryWrapper.orderByDesc(Project::getCreateTime).orderByDesc(Project::getSortOrder);
+        queryWrapper.orderByDesc(Project::getCreateTime).orderByAsc(Project::getSortOrder);
         Page<ProjectPageVo> pageData = new Page<>();
         pageData.setCurrent(page.getCurrent());
         pageData.setSize(page.getSize());