Merge remote-tracking branch 'origin/dev' into dev

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

@@ -22,13 +22,19 @@ public class Project extends BaseEntity {
      */
     @ApiModelProperty("id")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
+
+    /**
+     * 服务标签
+     */
+    @ApiModelProperty("服务标签（1：按摩 2：陪玩）")
+    private Integer type;
 
     /**
      * 服务类目ID
      */
     @ApiModelProperty("服务类目ID")
-    private Integer type;
+    private Long categoryId;
 
     /**
      * 标题。

nightFragrance-massage/src/main/java/com/ylx/project/domain/dto/ProjectAddDTO.java

@@ -19,9 +19,9 @@ public class ProjectAddDTO implements Serializable {
     @NotBlank(message = "项目标题不能为空")
     private String title;
 
-    @ApiModelProperty("项目分类")
+    @ApiModelProperty("服务类目ID")
     @NotNull(message = "服务类目ID不能为空")
-    private Integer type;
+    private Long categoryId;
 
     @ApiModelProperty("封面图")
     @NotBlank(message = "项目封面图不能为空")

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

@@ -27,5 +27,5 @@ public class ProjectSearchDTO implements Serializable {
      * 类目ID
      */
     @ApiModelProperty("类目ID")
-    private Integer type;
+    private Long categoryId;
 }

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

@@ -33,13 +33,13 @@ public class ProjectDetailVo implements Serializable {
      * 项目分类ID。
      */
     @ApiModelProperty("项目分类ID")
-    private Integer type;
+    private Long categoryId;
 
     /**
      * 项目分类名称。
      */
     @ApiModelProperty("项目分类名称")
-    private String typeName;
+    private String categoryName;
 
     /**
      * 项目封面图。

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

@@ -3,7 +3,6 @@ package com.ylx.project.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,8 +14,6 @@ import com.ylx.massage.domain.dto.OptionDTO;
 import com.ylx.massage.domain.dto.ServiceOptionDTO;
 import com.ylx.massage.domain.vo.ProductOptionVO;
 import com.ylx.massage.domain.vo.ProductServiceOptionVO;
-import com.ylx.point.domain.PointActivity;
-import com.ylx.point.domain.vo.PointActivityPageVo;
 import com.ylx.project.domain.Project;
 import com.ylx.project.domain.dto.ProjectAddDTO;
 import com.ylx.project.domain.dto.ProjectSearchDTO;
@@ -25,11 +22,14 @@ import com.ylx.project.domain.vo.ProjectDetailVo;
 import com.ylx.project.domain.vo.ProjectPageVo;
 import com.ylx.project.mapper.ProjectMapper;
 import com.ylx.project.service.ProjectService;
+import com.ylx.servicecategory.domain.ServiceCategory;
+import com.ylx.servicecategory.service.ServiceCategoryService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -37,6 +37,9 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
 
+    @Resource
+    private ServiceCategoryService serviceCategoryService;
+
     @Override
     public Page<ProjectPageVo> list(Page<Project> page, ProjectSearchDTO dto) {
         LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
@@ -48,9 +51,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (ObjectUtil.isNotEmpty(dto.getStatus())) {
             queryWrapper.eq(Project::getStatus, dto.getStatus());
         }
-        // 类目ID
-        if (ObjectUtil.isNotEmpty(dto.getType())) {
-            queryWrapper.eq(Project::getType, dto.getType());
+        // 服务类目ID
+        if (ObjectUtil.isNotEmpty(dto.getCategoryId())) {
+            queryWrapper.eq(Project::getCategoryId, dto.getCategoryId());
         }
         queryWrapper.orderByDesc(Project::getCreateTime).orderByDesc(Project::getSortOrder);
         Page<ProjectPageVo> pageData = new Page<>();
@@ -93,8 +96,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     public void add(ProjectAddDTO dto) {
 
         Project entity = new Project();
+
+        ServiceCategory serviceCategoryDetail = this.serviceCategoryService.getServiceCategoryDetail(dto.getCategoryId());
+        if (ObjectUtil.isNull(serviceCategoryDetail)) {
+            throw new ServiceException("服务类目不存在");
+        }
         BeanUtil.copyProperties(dto, entity);
 
+        entity.setType(serviceCategoryDetail.getServiceTag());
         entity.setCreateBy(SecurityUtils.getUsername());
         entity.setCreateTime(DateUtils.getNowDate());
 

nightFragrance-massage/src/main/resources/mapper/project/ProjectMapper.xml

@@ -53,8 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap id="ProjectDetailVoMap" type="com.ylx.project.domain.vo.ProjectDetailVo">
         <id column="id" property="id"/>
         <result column="title" property="title"/>
-        <result column="type" property="type"/>
-        <result column="type_name" property="typeName"/>
+        <result column="category_id" property="categoryId"/>
+        <result column="category_name" property="categoryName"/>
         <result column="cover" property="cover"/>
         <result column="price" property="price"/>
         <result column="price_min" property="priceMin"/>
@@ -76,8 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             p.id,
             p.title AS title,
-            p.type,
-            sc.name AS type_name,
+            p.category_id,
+            sc.name AS category_name,
             p.cover AS cover,
             p.price AS price,
             p.price_min,
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             p.create_time,
             p.update_time
         FROM project p
-        LEFT JOIN service_category sc ON sc.id = p.type AND sc.is_delete = 0
+        LEFT JOIN service_category sc ON sc.id = p.category_id AND sc.is_delete = 0
         WHERE p.id = #{id}
           AND p.is_delete = 0
     </select>