商户主页相册查询接口

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/MerchantApplyFileMapper.java

@@ -2,7 +2,11 @@ package com.ylx.massage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.massage.domain.MerchantApplyFile;
+import com.ylx.merchant.domain.dto.MerchantPictureDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -14,5 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface MerchantApplyFileMapper extends BaseMapper<MerchantApplyFile> {
 
+    List<String> getMerchantPicture(@Param("dto") MerchantPictureDTO dto);
 }
 

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

@@ -0,0 +1,9 @@
+package com.ylx.massage.service;
+
+import com.ylx.merchant.domain.dto.MerchantPictureDTO;
+
+import java.util.List;
+
+public interface MerchantApplyFileService {
+    List<String> getMerchantPicture(MerchantPictureDTO dto);
+}

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

@@ -0,0 +1,20 @@
+package com.ylx.massage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.massage.domain.MerchantApplyFile;
+import com.ylx.massage.mapper.MerchantApplyFileMapper;
+import com.ylx.massage.service.MerchantApplyFileService;
+import com.ylx.merchant.domain.dto.MerchantPictureDTO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class MerchantApplyFileServiceImpl extends ServiceImpl<MerchantApplyFileMapper, MerchantApplyFile> implements MerchantApplyFileService {
+
+    @Override
+    public List<String> getMerchantPicture(MerchantPictureDTO dto) {
+        return this.baseMapper.getMerchantPicture(dto);
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/merchant/controller/ClientMerchantController.java

@@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.domain.R;
 import com.ylx.massage.service.IMaTechnicianService;
 import com.ylx.massage.service.ITechnicianMomentService;
+import com.ylx.massage.service.MerchantApplyFileService;
 import com.ylx.merchant.domain.dto.*;
-import com.ylx.merchant.domain.vo.MerchantCommentVO;
-import com.ylx.merchant.domain.vo.MerchantDetailVO;
-import com.ylx.merchant.domain.vo.MerchantListVO;
-import com.ylx.merchant.domain.vo.MomentVO;
+import com.ylx.merchant.domain.vo.*;
 import com.ylx.order.service.TCommentUserService;
 import com.ylx.project.domain.bookMerchant.vo.ProjectInfoVO;
 import io.swagger.annotations.Api;
@@ -19,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("/client/merchant")
@@ -33,6 +32,8 @@ public class ClientMerchantController {
     private ITechnicianMomentService momentService;
     @Resource
     private TCommentUserService commentUserService;
+    @Resource
+    private MerchantApplyFileService merchantApplyFileService;
 
     @PostMapping("/page")
     @ApiOperation("同城搭子分页查询接口")
@@ -62,6 +63,13 @@ public class ClientMerchantController {
         return R.ok(pageData);
     }
 
+    @PostMapping("/picture/list")
+    @ApiOperation("商户主页相册查询接口")
+    public R<List<String>> getMerchantPicture(@Validated @RequestBody MerchantPictureDTO dto) {
+        List<String> list = this.merchantApplyFileService.getMerchantPicture(dto);
+        return R.ok(list);
+    }
+
     @PostMapping("/detail")
     @ApiOperation("商户主页商户详情接口")
     public R<MerchantDetailVO> getDetailById(@Validated @RequestBody MerchantDetailDTO dto) {

nightFragrance-massage/src/main/java/com/ylx/merchant/domain/dto/MerchantPictureDTO.java

@@ -0,0 +1,22 @@
+package com.ylx.merchant.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+@ApiModel("商户相册分页查询DTO")
+public class MerchantPictureDTO implements Serializable {
+    private static final long serialVersionUID = -1307550361222681902L;
+
+    @NotNull(message = "商户ID不能为空")
+    @ApiModelProperty("商户ID")
+    private Long id;
+
+    @ApiModelProperty("文件类型:1-形象照,2-生活照,3-身份证正面 4-身份证反面 5-手持身份证 6-健康证 7-从业资格证,8-无犯罪证明,9-承诺书,10-承诺录音,11-承诺录像,12-其他")
+    private String fileType;
+
+}

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

@@ -0,0 +1,37 @@
+package com.ylx.merchant.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Data
+@ApiModel("商户相册vo")
+public class MerchantPictureVO implements Serializable {
+    private static final long serialVersionUID = 1218151463428678293L;
+
+
+    @JsonIgnore
+    @ApiModelProperty(name = "商户生活照")
+    private String lifestyleStr;
+
+    @ApiModelProperty(name = "商户生活照")
+    private List<String> lifestyles;
+
+    public List<String> getLifestyles() {
+        return convertToList(this.lifestyleStr);
+    }
+
+    private List<String> convertToList(String str) {
+        if (str == null || str.isEmpty()) {
+            return new ArrayList<>();
+        }
+        return Arrays.asList(str.split(","));
+    }
+
+}

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ylx.massage.mapper.MerchantApplyFileMapper">
+
+    <select id="getMerchantPicture" resultType="java.lang.String">
+        SELECT
+            file_url
+        FROM
+            merchant_apply_file
+        WHERE
+            merchant_id = #{dto.id}
+        AND file_type = IFNULL(#{dto.fileType}, '2')
+        AND is_delete = 0
+        AND audit_status = 1
+        ORDER BY
+            create_time DESC
+    </select>
+</mapper>