修改查询商户未开通的技能列表接口的bug

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

@@ -755,7 +755,7 @@ public class MaTechnicianController extends BaseController {
      * 查询未开通的服务项目列表
      *
      * @param req
-     * @return
+     * @return R<?>
      */
     @PostMapping("/getNotApplyList")
     @ApiOperation("查询未开通的服务项目列表")

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

@@ -1639,15 +1639,17 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
     /**
      * 获取未申请技能列表
      *
-     * @param userId
-     * @param typeId
-     * @return
+     * @param merchantId
+     * @param serviceTag
+     * @return List<Project>
      */
     @Override
     public List<Project> getNotApplyList(Integer merchantId, Integer serviceTag) {
         LambdaQueryWrapper<MaProject> query = new LambdaQueryWrapper<>();
         query.eq(MaProject::getMerchantId, merchantId);
         query.eq(MaProject::getServiceTag, serviceTag);
+        // 审核状态：审核通过
+        query.eq(MaProject::getAuditStatus, 1);
         List<MaProject> maProjectList = maProjectMapper.selectList(query);
         // 获取已申请技能ID集合
         List<Integer> projectIdList = maProjectList.stream().map(MaProject::getProjectId).collect(Collectors.toList());

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

@@ -25,7 +25,7 @@ public class Project extends BaseEntity {
     private Integer id;
 
     /**
-     * 服务标签
+     * 服务标签（1：按摩 2：陪玩）
      */
     @ApiModelProperty("服务标签（1：按摩 2：陪玩）")
     private Integer type;