feat: 新增服务商创建，查询，修改审核/认证状态

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/controller/BlinkProviderController.java

@@ -32,9 +32,15 @@ public class BlinkProviderController {
         return providerService.supportsProviderQueryPage(qry);
     }
 
-    @Operation(summary = "修改服务商审核状态/认证状态")
-    @GetMapping("/supports/provider/updateStatus")
-    public ResponseDTO<String> supportsUpdateProviderStatus(BlinkProviderQry qry) {
-        return providerService.supportsUpdateProviderStatus(qry);
+    @Operation(summary = "去审核服务商-修改status")
+    @GetMapping("/supports/provider/toVerify/{id}")
+    public ResponseDTO<BlinkProviderDTO> supportsToVerifyProvider(@PathVariable("id") Long id) {
+        return providerService.supportsToVerifyProvider(id);
+    }
+
+    @Operation(summary = "审核完成-修改status")
+    @PostMapping("/supports/provider/verifyFinish")
+    public ResponseDTO<String> supportsVerifyFinishProvider(@RequestBody @Valid BlinkProviderDTO dto) {
+        return providerService.supportsVerifyFinishProvider(dto);
     }
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dataobject/BlinkProviderDO.java

@@ -166,11 +166,28 @@ public class BlinkProviderDO extends BaseEntity {
     private String attachment;
 
     /**
-     * 审核状态（0-待审核、1-审核中、3-不合格、4-通过）
+     * 核实意见
      * */
-    private Integer status;
+    private String verifyOpinion;
+
+    /**
+     * 核实日期
+     * */
+    private String verifyDate;
+
     /**
-     * 认证状态（true-已认证、false-未认证）
+     * 信息核实及评价
      * */
-    private String authentication;
+    private String verifyEvaluation;
+
+    /**
+     * 服务商等级
+     * */
+    private String providerGrade;
+
+    /**
+     * 审核状态（0-待审核、1-审核中、3-不合格、4-通过）
+     * */
+    private Integer status;
+
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dto/BlinkProviderDTO.java

@@ -1,5 +1,6 @@
 package com.cloud.sa.management.domain.dto;
 
+import com.cloud.sa.base.common.domain.BaseEntity;
 import com.cloud.sa.base.common.json.deserializer.DictValueVoDeserializer;
 import com.cloud.sa.base.common.json.deserializer.FileKeyVoDeserializer;
 import com.cloud.sa.base.common.json.serializer.FileKeyVoSerializer;
@@ -8,7 +9,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
 @Data
-public class BlinkProviderDTO {
+public class BlinkProviderDTO extends BaseEntity {
 
     /**
      * 主键
@@ -187,18 +188,29 @@ public class BlinkProviderDTO {
     private String attachment;
 
     /**
-     * 审核状态（0-待审核、1-审核中、3-不合格、4-通过）
+     * 核实意见
      * */
-    private Integer status;
+    private String verifyOpinion;
+
+    /**
+     * 核实日期
+     * */
+    private String verifyDate;
 
     /**
-     * 认证状态（true-已认证、false-未认证）
+     * 信息核实及评价
      * */
-    private String authentication;
+    private String verifyEvaluation;
 
     /**
-     * 创建时间
+     * 服务商等级
      * */
-    private String createTime;
+    @JsonDeserialize(using = DictValueVoDeserializer.class)
+    private String providerGrade;
+
+    /**
+     * 审核状态（0-待审核、1-审核中、3-不合格、4-通过）
+     * */
+    private Integer status;
 
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/dto/BlinkRiskRuleDTO.java

@@ -1,12 +1,13 @@
 package com.cloud.sa.management.domain.dto;
 
 import com.cloud.sa.base.common.annoation.DataAdaptorMapping;
+import com.cloud.sa.base.common.domain.BaseEntity;
 import com.cloud.sa.base.common.json.deserializer.DictValueVoDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
 
 @Data
-public class BlinkRiskRuleDTO {
+public class BlinkRiskRuleDTO extends BaseEntity {
 
     /**
      * id

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/domain/qry/BlinkProviderQry.java

@@ -26,8 +26,4 @@ public class BlinkProviderQry extends PageParam {
      * */
     private Integer status;
 
-    /**
-     *  认证状态（0-待审核、1-审核中、3-不合格、4-通过） qry
-     * */
-    private String authentication;
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/manager/BlinkProviderServiceImpl.java

@@ -16,8 +16,6 @@ import com.cloud.sa.management.repository.BlinkProviderRepository;
 import com.cloud.sa.management.service.IBlinkProviderService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
 
@@ -26,9 +24,13 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
 
     @Resource
     private SerialNumberService serialNumberService;
+
     @Resource
     private BlinkProviderRepository repository;
 
+    @Resource
+    private BlinkProviderMapper providerMapper;
+
 
     /**
      * 服务商创建
@@ -39,11 +41,11 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
     @Override
     public ResponseDTO<String> supportsProviderCreate(BlinkProviderDTO dto) {
         // 验证服务商名称是否重复
-        BlinkProviderDO blinkProviderDO = repository.queryByProviderName(dto.getProviderName(), null, Boolean.FALSE);
-        if (Objects.nonNull(blinkProviderDO)){
+        BlinkProviderDO providerDO = repository.queryByProviderName(dto.getProviderName(), null, Boolean.FALSE);
+        if (Objects.nonNull(providerDO)){
             return ResponseDTO.userErrorParam("服务商名称重复!请检查");
         }
-        BlinkProviderDO providerDO = BlinkProviderMapper.INSTANCE.toBlinkProviderDO(dto);
+        providerMapper.toBlinkProviderDO(dto, providerDO);
         // 生成服务商流水号
         SerialNumberIdEnum serialNumberIdEnum = BlinkEnumUtil.getEnumByValue(4, SerialNumberIdEnum.class);
         String serialNumber = serialNumberService.generate(serialNumberIdEnum);
@@ -53,9 +55,6 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
         providerDO.setProviderId("KH" + serialNumber);
         // 设置创建人
 
-        // 设置创建时间
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        providerDO.setCreateTime(LocalDateTime.parse(dto.getCreateTime(), formatter));
         // 执行创建操作
         this.save(providerDO);
         return ResponseDTO.ok();
@@ -76,21 +75,49 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
     }
 
     /**
-     * 修改服务商审核状态/认证状态
+     * 去审核-修改服务商审核状态状态（审核中）
      *
-     * @param qry
+     * @param id
      * @return
      */
     @Override
-    public ResponseDTO<String> supportsUpdateProviderStatus(BlinkProviderQry qry) {
+    public ResponseDTO<BlinkProviderDTO> supportsToVerifyProvider(Long id) {
         // 验证服务商名是否存在
-        BlinkProviderDO blinkProviderDO = repository.queryByProviderName(null, qry.getId(), Boolean.FALSE);
-        if (Objects.nonNull(blinkProviderDO)){
+        BlinkProviderDO providerDO = repository.queryByProviderName(null, id, Boolean.FALSE);
+        if (!Objects.nonNull(providerDO)){
             return ResponseDTO.userErrorParam("服务商不存在!请检查");
         }
-        // 修改服务商审核状态/认证状态
-        repository.supportsUpdateProviderStatus(qry);
+        // 修改为审核中状态
+        providerDO.setStatus(1);
+        this.updateById(providerDO);
+        BlinkProviderDTO dto = new BlinkProviderDTO();
+        providerMapper.toBlinkProviderDTO(providerDO, dto);
+        return ResponseDTO.ok(dto);
+    }
 
+    /**
+     * 审核完成-修改服务商审核状态状态（通过/不通过）
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public ResponseDTO<String> supportsVerifyFinishProvider(BlinkProviderDTO dto) {
+        // 验证服务商名是否存在
+        BlinkProviderDO providerDO = repository.queryByProviderName(null, dto.getId(), Boolean.FALSE);
+        if (!Objects.nonNull(providerDO)){
+            return ResponseDTO.userErrorParam("服务商不存在!请检查");
+        }
+        // 添加审核信息
+        providerMapper.toBlinkProviderDO(dto, providerDO);
+
+        if (dto.getVerifyOpinion().equals("通过")){
+            providerDO.setStatus(4);
+        }else {
+            providerDO.setStatus(3);
+        }
+        // 修改服务商审核状态
+        this.updateById(providerDO);
         return ResponseDTO.ok();
     }
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/objectmapper/BlinkProviderMapper.java

@@ -3,13 +3,15 @@ package com.cloud.sa.management.objectmapper;
 import com.cloud.sa.management.domain.dataobject.BlinkProviderDO;
 import com.cloud.sa.management.domain.dto.BlinkProviderDTO;
 import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
 
-@Mapper(componentModel = "spring")
+@Mapper(componentModel = "spring", nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
 public interface BlinkProviderMapper {
 
-    BlinkProviderMapper INSTANCE = Mappers.getMapper(BlinkProviderMapper.class);
+    void toBlinkProviderDO(BlinkProviderDTO blinkProviderDTO, @MappingTarget BlinkProviderDO blinkProviderDO);
 
-    BlinkProviderDO toBlinkProviderDO(BlinkProviderDTO blinkProviderDTO);
+
+    void toBlinkProviderDTO(BlinkProviderDO blinkProviderDO, @MappingTarget BlinkProviderDTO blinkProviderDTO);
 
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/repository/BlinkProviderRepository.java

@@ -34,12 +34,4 @@ public interface BlinkProviderRepository extends BaseMapper<BlinkProviderDO> {
      */
     List<BlinkProviderDTO> supportsProviderQueryPage(Page<?> page, @Param("query") BlinkProviderQry qry);
 
-    /**
-     * 修改服务商审核状态/认证状态
-     *
-     * @param qry
-     * @return
-     */
-    void supportsUpdateProviderStatus(@Param("query") BlinkProviderQry qry);
-
 }

bound-link-api/blink-management/src/main/java/com/cloud/sa/management/service/IBlinkProviderService.java

@@ -24,11 +24,19 @@ public interface IBlinkProviderService {
     ResponseDTO<PageResult<BlinkProviderDTO>> supportsProviderQueryPage(BlinkProviderQry qry);
 
     /**
-     * 修改服务商审核状态/认证状态
+     * 去审核-修改服务商审核状态状态（审核中）
      *
-     * @param qry
+     * @param id
+     * @return
+     */
+    ResponseDTO<BlinkProviderDTO> supportsToVerifyProvider(Long id);
+
+    /**
+     * 审核完成-修改服务商审核状态状态（通过/不通过）
+     *
+     * @param dto
      * @return
      */
-    ResponseDTO<String> supportsUpdateProviderStatus(BlinkProviderQry qry);
+    ResponseDTO<String> supportsVerifyFinishProvider(BlinkProviderDTO dto);
 
 }

bound-link-api/blink-management/src/main/resources/mapper/BlinkProviderRepositoryMapper.xml

@@ -24,9 +24,6 @@
         <if test="query.providerType != null and query.providerType !=''">
             AND provider_type = #{query.providerType}
         </if>
-        <if test="query.authentication != null and query.authentication !=''">
-            AND authentication = #{query.authentication}
-        </if>
         <if test="query.id != null">
             AND id = #{query.id}
         </if>
@@ -35,26 +32,10 @@
                 AND status = #{query.status}
             </when>
             <otherwise>
-                AND status != 3
+                AND status NOT IN (3,4)
             </otherwise>
         </choose>
         order by create_time desc
     </select>
-<!--    修改服务商审核状态/认证状态-->
-    <update id="supportsUpdateProviderStatus">
-        UPDATE blink_provider
-        SET
-        <choose>
-            <when test="query.status != null">
-                status = #{query.status}
-            </when>
-            <otherwise>
-                authentication = 'true'
-            </otherwise>
-        </choose>
-        WHERE id = #{query.id}
-          AND deleted_flag = 0
-    </update>
-
 
 </mapper>