优化代码

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

@@ -180,7 +180,7 @@ public class WeSqController extends BaseController {
                     user.setTeNickName(nickName);
                     user.setTeAvatar(avatarUrl);
                     user.setTePhone(phoneNumber);
-                    user.setOpenService(-1);
+                    user.setOpenService("-1");
                     maTechnicianService.save(user);
                     //异步 添加新人优惠卷
                     //                threadPoolTaskExecutor.submit(() -> couponReceiveService.submit(new CouponReceive().setOpenid(finalUser.getcOpenid()).setCouponId("1")));

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

@@ -54,9 +54,9 @@ public class MaTechnicianMerchantDetailVO {
     private String openService;
 
     /**
-     * 商户开通的服务类目名称。
+     * 商户开通的服务类目名称
      */
-    @ApiModelProperty("服务类目")
+    @ApiModelProperty("商户开通的服务类目名称")
     private String serviceCategoryName;
 
     /**
@@ -68,7 +68,7 @@ public class MaTechnicianMerchantDetailVO {
     /**
      * 商户开通的服务项目名称，多个用斜杠分隔。
      */
-    @ApiModelProperty("服务项目")
+    @ApiModelProperty("服务项目名称")
     private String serviceProjectName;
 
     /**

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

@@ -1,7 +1,9 @@
 package com.ylx.massage.service;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.common.core.domain.model.LoginUser;
 import com.ylx.massage.domain.MaTechnician;
 import com.ylx.massage.domain.dto.MassageMerchantRecommendDto;
@@ -18,8 +20,7 @@ import com.ylx.massage.domain.vo.MerchantVo;
  * @author ylx
  * @date 2024-03-22
  */
-public interface IMaTechnicianService
-{
+public interface IMaTechnicianService extends IService<MaTechnician> {
     /**
      * 查询技师
      *
@@ -47,7 +48,7 @@ public interface IMaTechnicianService
     /**
      * 后台新增商户
      *
-     * @param dto 新增商户参数
+     * @param dto       新增商户参数
      * @param loginUser 当前登录用户
      * @return 结果
      */
@@ -57,7 +58,7 @@ public interface IMaTechnicianService
      * 后台查询商户列表
      *
      * @param page 分页参数
-     * @param dto 查询条件
+     * @param dto  查询条件
      * @return 商户分页列表
      */
     public Page<MaTechnicianMerchantListVO> selectMerchantList(Page<MaTechnicianMerchantListVO> page,
@@ -97,6 +98,7 @@ public interface IMaTechnicianService
 
     /**
      * 首页选中的城市是否有开通服务
+     *
      * @param areaCode
      * @return
      */

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

@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.domain.model.LoginUser;
@@ -40,8 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2024-03-22
  */
 @Service
-public class MaTechnicianServiceImpl implements IMaTechnicianService
-{
+public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaTechnician> implements IMaTechnicianService {
     private static final int SERVICE_STATE_AVAILABLE = 1;
     private static final int POST_STATE_OFFLINE = 0;
     private static final int ENABLED = 1;
@@ -68,8 +67,7 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
      * @return 技师
      */
     @Override
-    public MaTechnician selectMaTechnicianById(Long id)
-    {
+    public MaTechnician selectMaTechnicianById(Long id) {
         return maTechnicianMapper.selectMaTechnicianById(id);
     }
 
@@ -80,8 +78,7 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
      * @return 技师
      */
     @Override
-    public List<MaTechnician> selectMaTechnicianList(MaTechnician maTechnician)
-    {
+    public List<MaTechnician> selectMaTechnicianList(MaTechnician maTechnician) {
         return maTechnicianMapper.selectMaTechnicianList(maTechnician);
     }
 
@@ -93,8 +90,7 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertMaTechnician(MaTechnicianAppAddVo maTechnicianAppAddVo)
-    {
+    public int insertMaTechnician(MaTechnicianAppAddVo maTechnicianAppAddVo) {
         MaTechnician maTechnician = new MaTechnician();
         BeanUtils.copyProperties(maTechnicianAppAddVo, maTechnician);
         int rows = maTechnicianMapper.insertMaTechnician(maTechnician);
@@ -107,7 +103,7 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
     /**
      * 后台新增商户
      *
-     * @param dto 新增商户参数
+     * @param dto       新增商户参数
      * @param loginUser 当前登录用户
      * @return 结果
      */
@@ -156,7 +152,7 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
      * 后台查询商户列表
      *
      * @param page 分页参数
-     * @param dto 查询条件
+     * @param dto  查询条件
      * @return 商户分页列表
      */
     @Override
@@ -187,12 +183,11 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
     /**
      * 修改技师
      *
-     * @param  maTechnicianAppAddVo
+     * @param maTechnicianAppAddVo
      * @return 结果
      */
     @Override
-    public int updateMaTechnician(MaTechnicianAppAddVo maTechnicianAppAddVo)
-    {
+    public int updateMaTechnician(MaTechnicianAppAddVo maTechnicianAppAddVo) {
 
         MaTechnician maTechnician = new MaTechnician();
         BeanUtils.copyProperties(maTechnicianAppAddVo, maTechnician);
@@ -207,8 +202,7 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
      * @return 结果
      */
     @Override
-    public int deleteMaTechnicianByIds(Long[] ids)
-    {
+    public int deleteMaTechnicianByIds(Long[] ids) {
         return maTechnicianMapper.deleteMaTechnicianByIds(ids);
     }
 
@@ -219,13 +213,13 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
      * @return 结果
      */
     @Override
-    public int deleteMaTechnicianById(Long id)
-    {
+    public int deleteMaTechnicianById(Long id) {
         return maTechnicianMapper.deleteMaTechnicianById(id);
     }
 
     /**
      * 首页选中的城市是否有开通服务
+     *
      * @param areaCode
      * @return
      */
@@ -238,6 +232,7 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
 
     /**
      * 首页按摩推荐
+     *
      * @param dto
      * @return
      */
@@ -294,7 +289,7 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
     /**
      * 校验服务项目ID集合
      *
-     * @param projectIds 服务项目ID集合
+     * @param projectIds  服务项目ID集合
      * @param categoryIds 服务类目ID集合
      * @return 有效服务项目ID集合
      */
@@ -323,13 +318,13 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
         Set<Integer> projectCategoryIds = new LinkedHashSet<>();
         for (Long projectId : distinctProjectIds) {
             Project project = projectMap.get(projectId);
-            if (project == null || project.getType() == null) {
+            if (project == null || project.getCategoryId() == null) {
                 throw new ServiceException("服务项目类目不能为空");
             }
-            if (!categoryIds.contains(project.getType())) {
+            if (!categoryIds.contains(project.getCategoryId())) {
                 throw new ServiceException("服务项目不属于所选服务类目");
             }
-            projectCategoryIds.add(project.getType());
+            projectCategoryIds.add(project.getCategoryId());
         }
         if (!projectCategoryIds.containsAll(categoryIds)) {
             throw new ServiceException("每个服务类目至少选择一个服务项目");

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

@@ -22,7 +22,7 @@ public class Project extends BaseEntity {
      */
     @ApiModelProperty("id")
     @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
+    private Integer id;
 
     /**
      * 服务标签
@@ -34,7 +34,7 @@ public class Project extends BaseEntity {
      * 服务类目ID
      */
     @ApiModelProperty("服务类目ID")
-    private Long categoryId;
+    private Integer categoryId;
 
     /**
      * 标题。

nightFragrance-massage/src/main/resources/mapper/massage/MaTechnicianMapper.xml

@@ -33,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="techType"    column="tech_type"    />
         <result property="teIsEnable"    column="te_is_enable"    />
         <result property="auditStatus"    column="audit_status"    />
-        <result property="createUser"    column="create_user"    />
-        <result property="updateUser"    column="update_user"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isDelete"    column="is_delete"    />