修改申请下架、删除服务项目、编辑售价价格接口的bug

nightFragrance-massage/src/main/java/com/ylx/massage/domain/MaProject.java

@@ -3,10 +3,7 @@ package com.ylx.massage.domain;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -112,13 +109,6 @@ public class MaProject implements Serializable {
     @ApiModelProperty("商户手机号")
     private String merchantPhone;
 
-    /**
-     * 项目主图
-     */
-    @Excel(name = "项目主图")
-    @ApiModelProperty("项目主图")
-    private String projectMasterImage;
-
     /**
      * 服务标签：1-上门按摩，2-同城陪玩
      */
@@ -126,12 +116,6 @@ public class MaProject implements Serializable {
     @ApiModelProperty("服务标签：1-上门按摩，2-同城陪玩")
     private Integer serviceTag;
 
-    /**
-     * 项目详情图
-     */
-    @Excel(name = "项目详情图")
-    @ApiModelProperty("项目详情图")
-    private String projectDetailImage;
     /**
      * 开通理由
      */
@@ -207,4 +191,16 @@ public class MaProject implements Serializable {
     @Excel(name = "是否删除(0否1是)")
     @TableLogic
     private Integer isDelete;
+
+    /**
+     * 项目封面图
+     */
+    @TableField(exist = false)
+    private String cover;
+
+    /**
+     * 计量单位(0:分钟 1:小时 2:次）
+     */
+    @TableField(exist = false)
+    private Integer unitType;
 }

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

@@ -1040,7 +1040,15 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         LambdaQueryWrapper<MaProject> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MaProject::getMerchantId, merchantId);
         queryWrapper.eq(MaProject::getAuditStatus, auditStatus);
-        return maProjectMapper.selectList(queryWrapper);
+        List<MaProject> maProjects = maProjectMapper.selectList(queryWrapper);
+        maProjects.forEach(maProject -> {
+            //根据项目ID查询项目图片
+            Integer projectId = maProject.getProjectId();
+            Project project = projectMapper.selectById(projectId);
+            maProject.setCover(project.getCover());
+            maProject.setUnitType(project.getUnitType());
+        });
+        return maProjects;
     }
 
     /**