fix:项目中推荐技师

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

@@ -8,6 +8,7 @@ import com.ylx.common.enums.BusinessType;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.massage.domain.THighlights;
 import com.ylx.massage.domain.TXiangmu;
+import com.ylx.massage.domain.vo.TXiangmuDetailVo;
 import com.ylx.massage.service.THighlightsService;
 import com.ylx.massage.service.TXiangmuService;
 import io.swagger.annotations.Api;
@@ -101,7 +102,8 @@ public class TXiangmuController {
     @ApiOperation("根据id查询项目")
     @RequestMapping(value = "/getByid", method = RequestMethod.POST)
     public R getById(@RequestBody TXiangmu xiangmu) {
-        return R.ok(xiangmuService.getById(xiangmu.getcId()));
+        TXiangmuDetailVo details = xiangmuService.details(xiangmu.getcId());
+        return R.ok(details);
     }
 
     /**

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

@@ -89,7 +89,7 @@ public class TXiangmu implements Serializable {
     private String cSyrq;
 
     /**
-     * 项目详情 富文本
+     * 项目详情 复文本
      */
     @TableField("c_detail")
     @ApiModelProperty("项目详情 富文本")
@@ -102,6 +102,13 @@ public class TXiangmu implements Serializable {
     @ApiModelProperty("已售")
     private Integer nSaleNumber;
 
+    /**
+     * 推荐技师
+     */
+    @TableField("recommend_technician")
+    @ApiModelProperty("推荐技师")
+    private String recommendTechnician;
+
     /**
      * 创建时间
      */

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

@@ -0,0 +1,22 @@
+package com.ylx.massage.domain.vo;
+
+import com.ylx.massage.domain.TJs;
+import com.ylx.massage.domain.TXiangmu;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author jianlong
+ * @date 2024-09-07 11:44
+ */
+@Data
+@ApiModel(value = "TXiangmuDetailVo", description = "服务项目详情")
+public class TXiangmuDetailVo extends TXiangmu {
+
+    @ApiModelProperty("技师列表")
+    private List<TJs> jsList;
+
+}

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

@@ -2,6 +2,7 @@ package com.ylx.massage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.massage.domain.TXiangmu;
+import com.ylx.massage.domain.vo.TXiangmuDetailVo;
 
 
 /**
@@ -13,4 +14,6 @@ import com.ylx.massage.domain.TXiangmu;
 public interface TXiangmuService extends IService<TXiangmu> {
 
     Boolean addOrUpdate(TXiangmu xiangmu);
+
+    TXiangmuDetailVo details(String id);
 }

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

@@ -1,19 +1,28 @@
 package com.ylx.massage.service.impl;
 
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.constant.MassageConstants;
-import com.ylx.common.core.domain.R;
 import com.ylx.common.exception.ServiceException;
+import com.ylx.common.utils.bean.BeanUtils;
+import com.ylx.massage.domain.TJs;
 import com.ylx.massage.domain.TXiangmu;
+import com.ylx.massage.domain.vo.TXiangmuDetailVo;
 import com.ylx.massage.mapper.TXiangmuMapper;
+import com.ylx.massage.service.TJsService;
 import com.ylx.massage.service.TXiangmuService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.rmi.ServerException;
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 项目Service接口
@@ -23,24 +32,26 @@ import java.time.LocalDateTime;
  */
 @Service
 public class TXiangmuServiceImpl extends ServiceImpl<TXiangmuMapper, TXiangmu> implements TXiangmuService {
+    @Resource
+    private TJsService jsService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean addOrUpdate(TXiangmu xiangmu) {
         if (StringUtils.isBlank(xiangmu.getcId())) {
-            if(StringUtils.isBlank(xiangmu.getcCover())){
+            if (StringUtils.isBlank(xiangmu.getcCover())) {
                 throw new ServiceException("封面图不能为空");
             }
-            if(StringUtils.isBlank(xiangmu.getcTitle())){
+            if (StringUtils.isBlank(xiangmu.getcTitle())) {
                 throw new ServiceException("标题不能为空");
             }
-            if(null == xiangmu.getdPrice()){
+            if (null == xiangmu.getdPrice()) {
                 throw new ServiceException("标注价格（现价）不能为空");
             }
-            if(null == xiangmu.getdYuanPrice()){
+            if (null == xiangmu.getdYuanPrice()) {
                 throw new ServiceException("原价不能为空");
             }
-            if(null == xiangmu.getnMinute()){
+            if (null == xiangmu.getnMinute()) {
                 throw new ServiceException("时长不能为空");
             }
             xiangmu.setnSaleNumber(MassageConstants.INTEGER_ZERO);
@@ -48,4 +59,24 @@ public class TXiangmuServiceImpl extends ServiceImpl<TXiangmuMapper, TXiangmu> i
         }
         return this.saveOrUpdate(xiangmu);
     }
+
+    @Override
+    public TXiangmuDetailVo details(String id) {
+        TXiangmu byId = this.getById(id);
+        if (null != byId) {
+            TXiangmuDetailVo tXiangmuDetailVo = new TXiangmuDetailVo();
+            BeanUtils.copyBeanProp(tXiangmuDetailVo, byId);
+            //查技师
+            if (StringUtils.isBlank(byId.getRecommendTechnician())) {
+                return tXiangmuDetailVo;
+            }
+            List<String> jsList = Arrays.stream(byId.getRecommendTechnician().split(",")).collect(Collectors.toList());
+            LambdaQueryWrapper<TJs> jsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            jsLambdaQueryWrapper.in(CollectionUtil.isNotEmpty(jsList), TJs::getId, jsList);
+            List<TJs> list = jsService.list(jsLambdaQueryWrapper);
+            tXiangmuDetailVo.setJsList(list);
+            return tXiangmuDetailVo;
+        }
+        return null;
+    }
 }