协销服务商合并

src/main/java/com/caimei365/user/controller/ProvidersController.java

@@ -1,7 +1,7 @@
 package com.caimei365.user.controller;
 
 import com.caimei365.user.model.ResponseJson;
-import com.caimei365.user.model.po.CmProviders;
+import com.caimei365.user.model.po.ServiceProviderModel;
 import com.caimei365.user.model.vo.CmProvidersVO;
 import com.caimei365.user.service.CmProvidersService;
 import com.caimei365.user.utils.BeanUtil;
@@ -32,12 +32,12 @@ public class ProvidersController {
      * 服务商入驻信息查询
      */
     @GetMapping("/from")
-    public ResponseJson getProvidersFrom(String providersId,String providersName,
+    public ResponseJson getProvidersFrom(Integer serviceProviderId, String providersName,
                                          @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "20") int pageSize
-                                         ) {
+    ) {
         PageHelper.startPage(pageNum, pageSize);
-        List<CmProviders> cmProviders = cmProvidersService.getByCmProviders(new CmProviders().setId(providersId).setName(providersName).setStatus(90));
+        List<ServiceProviderModel> cmProviders = cmProvidersService.getByCmProviders(new ServiceProviderModel().setServiceProviderId(serviceProviderId).setName(providersName).setStatus(90));
         return ResponseJson.success(new PageInfo<>(BeanUtil.setValues(cmProviders, CmProvidersVO.class)));
     }
 }

src/main/java/com/caimei365/user/mapper/CmProvidersMapper.java

@@ -1,6 +1,6 @@
 package com.caimei365.user.mapper;
 
-import com.caimei365.user.model.po.CmProviders;
+import com.caimei365.user.model.po.ServiceProviderModel;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -12,15 +12,14 @@ import java.util.List;
  * @date 2023-12-14
  */
 @Mapper
-public interface CmProvidersMapper
-{
+public interface CmProvidersMapper {
     /**
      * 通过对象查询列表
      *
      * @param cmProviders
      * @return 集合
      */
-    List<CmProviders> getCmProvidersList(CmProviders cmProviders);
+    List<ServiceProviderModel> getCmProvidersList(ServiceProviderModel cmProviders);
 
     /**
      * 通过Id查询对象
@@ -28,7 +27,7 @@ public interface CmProvidersMapper
      * @param id 主键
      * @return
      */
-    CmProviders getCmProvidersById(String id);
+    ServiceProviderModel getCmProvidersById(String id);
 
     /**
      * 通过对象查询对象
@@ -36,55 +35,6 @@ public interface CmProvidersMapper
      * @param cmProviders
      * @return
      */
-    CmProviders getByCmProviders(CmProviders cmProviders);
-
-    /**
-     * 通过对象查询Id
-     *
-     * @param cmProviders
-     * @return String
-     */
-    String getById(CmProviders cmProviders);
-
-
-    /**
-     * 通过对象查询记录总数
-     *
-     * @param cmProviders
-     * @return Integer
-     */
-    int getCount(CmProviders cmProviders);
-
-    /**
-     * 新增
-     *
-     * @param cmProviders
-     * @return 结果
-     */
-    int addCmProviders(CmProviders cmProviders);
-
-    /**
-     * 修改
-     *
-     * @param cmProviders
-     * @return 结果
-     */
-    int updateCmProviders(CmProviders cmProviders);
-
-    /**
-     * 删除
-     *
-     * @param id 主键
-     * @return 结果
-     */
-    int delCmProvidersById(String id);
-
-    /**
-     * 批量删除
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int delCmProviders(CmProviders cmProviders);
+    ServiceProviderModel getByCmProviders(ServiceProviderModel cmProviders);
 
 }

src/main/java/com/caimei365/user/model/po/CmProviders.java

@@ -1,82 +0,0 @@
-package com.caimei365.user.model.po;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.apache.ibatis.type.Alias;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 对象 cm_providers
- *
- * @author Kaick
- * @date 2023-12-14
- */
-@Accessors(chain  = true )
-@Data
-@Alias("CmProviders")
-public class CmProviders implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** id */
-    private String id;
-
-    /** 用户id */
-    private Integer userId;
-
-    /** 服务商名称 */
-    private String name;
-
-    /** 服务商级别为：1级，2级，3级 */
-    private Integer serviceLevel;
-
-    /** 服务商类型: 1个人，1企业 */
-    private Integer serviceCategory;
-
-    /** 服务商地址 */
-    private String address;
-
-    /** 联系人 */
-    private String linkMan;
-
-    /** 联系电话 */
-    private String mobile;
-
-    /** 状态：90上线，91下线 */
-    private Integer status;
-
-    /** 简介 */
-    private String text;
-
-    /** 服务商二维码 */
-    private String qrCodeImage;
-
-    /** 资格证书图片 */
-    private String qualificationImage;
-
-    /** 资格证书编号 */
-    private String qualificationId;
-
-    /** 创建人 */
-    private String createBy;
-
-    /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTime;
-
-    /** 添加时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 相关简介图集合
-     */
-    private List<String> textRelateds;
-}
-
-
-

src/main/java/com/caimei365/user/model/po/CmRelatedImage.java

@@ -14,36 +14,49 @@ import java.util.Date;
  * @author Kaick
  * @date 2023-12-14
  */
-@Accessors(chain  = true )
+@Accessors(chain = true)
 @Data
 @Alias("CmRelatedImage")
-public class CmRelatedImage implements Serializable
-{
+public class CmRelatedImage implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    /**
+     * id
+     */
     private String id;
 
-    /** 分类：1分销报备凭证图片(cm_reporting_member)
-     ,2 (cm_providers)服务商相关简介图
-     ,3 (cm_providers)服务商相关资料文件
-     ,4 (cm_providers_contract)服务商相关合同文件 */
+    /**
+     * 分类：1分销报备凭证图片(cm_reporting_member)
+     * ,2 (cm_providers)服务商相关简介图
+     * ,3 (cm_providers)服务商相关资料文件
+     * ,4 (cm_providers_contract)服务商相关合同文件
+     */
     private String type;
 
-    /** 归属者Id（type字段表Id） */
+    /**
+     * 归属者Id（type字段表Id）
+     */
     private String authorId;
 
-    /** 图片 */
+    /**
+     * 图片
+     */
     private String image;
 
-    /** 删除状态 0正常，其他删除 */
+    /**
+     * 删除状态 0正常，其他删除
+     */
     private Integer delFlag;
 
-    /** 修改时间 */
+    /**
+     * 修改时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
-    /** 添加时间 */
+    /**
+     * 添加时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 

src/main/java/com/caimei365/user/model/po/ServiceProviderModel.java

@@ -0,0 +1,124 @@
+package com.caimei365.user.model.po;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+@Accessors(chain = true)
+@Data
+public class ServiceProviderModel {
+
+    private Integer insiderFlag;
+
+    private Integer leaderId;
+
+    private String linkMan;
+
+    private String mobile;
+
+    private String password;
+    /**
+     * 协销Id
+     */
+    private Integer serviceProviderId;
+    /**
+     * 协销名称
+     */
+    private String name;
+    /**
+     * 协销用户Id
+     */
+    private Integer userId;
+    /**
+     * 协销组长名称
+     */
+    private String mainName;
+    /**
+     * 已注册客户数
+     */
+    private Integer registeredNumber;
+    /**
+     * 未注册客户数
+     */
+    private Integer unregisteredNumber;
+    /**
+     * 服务商级别为：1级，2级，3级，4 特约服务商,5品牌指定服务商
+     */
+    private Integer serviceLevel;
+    /**
+     * 特约品牌名称
+     */
+    private String brandName;
+    /**
+     * 服务商类型: 1个人，2企业
+     */
+    private Integer serviceCategory;
+    /**
+     * 状态：90上线，91下线
+     */
+    private Integer status;
+    /**
+     * 服务商地址
+     */
+    private String address;
+    /**
+     * 简介
+     */
+    private String text;
+
+    /**
+     * 服务商二维码
+     */
+    private String qrCodeImage;
+    /**
+     * 资格证书图片
+     */
+    private String qualificationImage;
+    /**
+     * 资格证书编号
+     */
+    private String qualificationId;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 添加时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date addTime;
+
+    /**
+     * 相关简介图集合
+     */
+    private List<String> textRelateds;
+
+    /**
+     * 相关资料文件集合
+     */
+    private List<CmRelatedImage> infoRelateds;
+
+
+    //服务商合同
+    /**
+     * 合同起始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date contractStartDate;
+
+    /**
+     * 合同截止日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date contractEndDate;
+
+    /**
+     * 服务商分帐号
+     */
+    private String splitCode;
+}

src/main/java/com/caimei365/user/model/vo/CmProvidersVO.java

@@ -12,45 +12,68 @@ import java.util.List;
  * @author Kaick
  * @date 2023-12-14
  */
-@Accessors(chain  = true )
+@Accessors(chain = true)
 @Data
-public class CmProvidersVO implements Serializable
-{
+public class CmProvidersVO implements Serializable {
     private static final long serialVersionUID = 1L;
-    /** id */
-    private String id;
+    /**
+     * id
+     */
+    private String serviceProviderId;
 
-    /** 用户id */
+    /**
+     * 用户id
+     */
     private Integer userId;
 
-    /** 服务商名称 */
+    /**
+     * 服务商名称
+     */
     private String name;
 
-    /** 服务商级别为：1级，2级，3级 */
+    /**
+     * 服务商级别为：1级，2级，3级
+     */
     private Integer serviceLevel;
 
-    /** 服务商类型: 1个人，1企业 */
+    /**
+     * 服务商类型: 1个人，1企业
+     */
     private Integer serviceCategory;
 
-    /** 服务商地址 */
+    /**
+     * 服务商地址
+     */
     private String address;
 
-    /** 联系人 */
+    /**
+     * 联系人
+     */
     private String linkMan;
 
-    /** 联系电话 */
+    /**
+     * 联系电话
+     */
     private String mobile;
 
-    /** 简介 */
+    /**
+     * 简介
+     */
     private String text;
 
-    /** 服务商二维码 */
+    /**
+     * 服务商二维码
+     */
     private String qrCodeImage;
 
-    /** 资格证书图片 */
+    /**
+     * 资格证书图片
+     */
     private String qualificationImage;
 
-    /** 资格证书编号 */
+    /**
+     * 资格证书编号
+     */
     private String qualificationId;
 
     /**

src/main/java/com/caimei365/user/service/CmProvidersService.java

@@ -1,6 +1,6 @@
 package com.caimei365.user.service;
 
-import com.caimei365.user.model.po.CmProviders;
+import com.caimei365.user.model.po.ServiceProviderModel;
 
 import java.util.List;
 
@@ -10,8 +10,7 @@ import java.util.List;
  * @author Kaick
  * @date 2023-12-14
  */
-public interface CmProvidersService
-{
+public interface CmProvidersService {
 
 
     /**
@@ -20,5 +19,5 @@ public interface CmProvidersService
      * @param cmProviders
      * @return
      */
-    List<CmProviders> getByCmProviders(CmProviders cmProviders);
+    List<ServiceProviderModel> getByCmProviders(ServiceProviderModel cmProviders);
 }

src/main/java/com/caimei365/user/service/impl/CmProvidersServiceImpl.java

@@ -2,8 +2,8 @@ package com.caimei365.user.service.impl;
 
 import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.CmProvidersMapper;
-import com.caimei365.user.model.po.CmProviders;
 import com.caimei365.user.model.po.CmRelatedImage;
+import com.caimei365.user.model.po.ServiceProviderModel;
 import com.caimei365.user.service.CmProvidersService;
 import org.springframework.stereotype.Service;
 
@@ -17,8 +17,7 @@ import java.util.List;
  * @date 2023-12-14
  */
 @Service
-public class CmProvidersServiceImpl implements CmProvidersService
-{
+public class CmProvidersServiceImpl implements CmProvidersService {
     @Resource
     private CmProvidersMapper cmProvidersMapper;
     @Resource
@@ -31,12 +30,11 @@ public class CmProvidersServiceImpl implements CmProvidersService
      * @return
      */
     @Override
-    public List<CmProviders> getByCmProviders(CmProviders cmProviders)
-    {
-        List<CmProviders> byCmProviders = cmProvidersMapper.getCmProvidersList(cmProviders);
-        if(null!=byCmProviders){
-            byCmProviders.forEach(s->{
-                s.setTextRelateds(baseMapper.getRelatedImageList(new CmRelatedImage().setType("2").setAuthorId(s.getId())));
+    public List<ServiceProviderModel> getByCmProviders(ServiceProviderModel cmProviders) {
+        List<ServiceProviderModel> byCmProviders = cmProvidersMapper.getCmProvidersList(cmProviders);
+        if (null != byCmProviders) {
+            byCmProviders.forEach(s -> {
+                s.setTextRelateds(baseMapper.getRelatedImageList(new CmRelatedImage().setType("2").setAuthorId(s.getServiceProviderId().toString())));
             });
         }
         return byCmProviders;

src/main/resources/mapper/CmProvidersMapper.xml

@@ -4,223 +4,102 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.user.mapper.CmProvidersMapper">
 
-    <resultMap type="CmProviders" id="CmProvidersResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="userId"    />
-        <result property="name"    column="name"    />
-        <result property="serviceLevel"    column="serviceLevel"    />
-        <result property="serviceCategory"    column="serviceCategory"    />
-        <result property="address"    column="address"    />
-        <result property="linkMan"    column="linkMan"    />
-        <result property="mobile"    column="mobile"    />
-        <result property="status"    column="status"    />
-        <result property="text"    column="text"    />
-        <result property="qrCodeImage"    column="qrCodeImage"    />
-        <result property="qualificationImage"    column="qualificationImage"    />
-        <result property="qualificationId"    column="qualificationId"    />
-        <result property="createBy"    column="createBy"    />
-        <result property="updateTime"    column="updateTime"    />
-        <result property="createTime"    column="createTime"    />
-    </resultMap>
-
-    <sql id="selectCmProvidersVo">
+    <select id="getByCmProviders" parameterType="com.caimei365.user.model.po.ServiceProviderModel" resultType="com.caimei365.user.model.po.ServiceProviderModel">
         select
-            cm_providers.id,
-            cm_providers.userId,
-            cm_providers.name,
-            cm_providers.serviceLevel,
-            cm_providers.serviceCategory,
-            cm_providers.address,
-            cm_providers.linkMan,
-            cm_providers.mobile,
-            cm_providers.status,
-            cm_providers.text,
-            cm_providers.qrCodeImage,
-            cm_providers.qualificationImage,
-            cm_providers.qualificationId,
-            cm_providers.createBy,
-            cm_providers.updateTime,
-            cm_providers.createTime
-    </sql>
-
-    <select id="getByCmProviders" parameterType="CmProviders" resultMap="CmProvidersResult">
-        <include refid="selectCmProvidersVo"/>
-        from cm_providers AS cm_providers
+        serviceProviderId,
+        name,
+        serviceLevel,
+        serviceCategory,
+        status,
+        userId,
+        address,
+        linkMan,
+        contractMobile as mobile,
+        text,
+        brandName,
+        qrCodeImage,
+        qualificationImage,
+        qualificationId,
+        createBy,
+        addTime,
+        splitCode
+        from serviceprovider
         <where>
-            <if test="id != null  and id != ''"> and cm_providers.id = #{id}</if>
-            <if test="userId != null "> and cm_providers.userId = #{userId}</if>
-            <if test="name != null  and name != ''"> and cm_providers.name like concat('%', #{name}, '%')</if>
-            <if test="serviceLevel != null "> and cm_providers.serviceLevel = #{serviceLevel}</if>
-            <if test="serviceCategory != null "> and cm_providers.serviceCategory = #{serviceCategory}</if>
-            <if test="address != null  and address != ''"> and cm_providers.address = #{address}</if>
-            <if test="linkMan != null  and linkMan != ''"> and cm_providers.linkMan = #{linkMan}</if>
-            <if test="mobile != null  and mobile != ''"> and cm_providers.mobile = #{mobile}</if>
-            <if test="status != null "> and cm_providers.status = #{status}</if>
-            <if test="text != null  and text != ''"> and cm_providers.text = #{text}</if>
-            <if test="qrCodeImage != null  and qrCodeImage != ''"> and cm_providers.qrCodeImage = #{qrCodeImage}</if>
-            <if test="qualificationImage != null  and qualificationImage != ''"> and cm_providers.qualificationImage = #{qualificationImage}</if>
-            <if test="qualificationId != null  and qualificationId != ''"> and cm_providers.qualificationId = #{qualificationId}</if>
+            <if test="serviceProviderId != null and serviceProviderId != ''">
+                and serviceProviderId = #{serviceProviderId}
+            </if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="serviceLevel != null ">and serviceLevel = #{serviceLevel}</if>
+            <if test="serviceCategory != null ">and cserviceCategory = #{serviceCategory}</if>
+            <if test="status != null ">and status = #{status}</if>
+            <if test="userId != null ">and userId = #{userId}</if>
+            <if test="address != null  and address != ''">and address = #{address}</if>
+            <if test="linkMan != null  and linkMan != ''">andlinkMan = #{linkMan}</if>
+            <if test="mobile != null  and mobile != ''">and contractMobile = #{mobile}</if>
         </where>
-        group by cm_providers.id
+        group by serviceProviderId
+        order by addTime desc
         limit 0,1
     </select>
 
-    <select id="getCmProvidersList" parameterType="CmProviders" resultMap="CmProvidersResult">
-        <include refid="selectCmProvidersVo"/>
-        from cm_providers AS cm_providers
-        <where>
-            <if test="id != null  and id != ''"> and cm_providers.id = #{id}</if>
-            <if test="userId != null "> and cm_providers.userId = #{userId}</if>
-            <if test="name != null  and name != ''"> and cm_providers.name like concat('%', #{name}, '%')</if>
-            <if test="serviceLevel != null "> and cm_providers.serviceLevel = #{serviceLevel}</if>
-            <if test="serviceCategory != null "> and cm_providers.serviceCategory = #{serviceCategory}</if>
-            <if test="address != null  and address != ''"> and cm_providers.address = #{address}</if>
-            <if test="linkMan != null  and linkMan != ''"> and cm_providers.linkMan = #{linkMan}</if>
-            <if test="mobile != null  and mobile != ''"> and cm_providers.mobile = #{mobile}</if>
-            <if test="status != null "> and cm_providers.status = #{status}</if>
-            <if test="text != null  and text != ''"> and cm_providers.text = #{text}</if>
-            <if test="qrCodeImage != null  and qrCodeImage != ''"> and cm_providers.qrCodeImage = #{qrCodeImage}</if>
-            <if test="qualificationImage != null  and qualificationImage != ''"> and cm_providers.qualificationImage = #{qualificationImage}</if>
-            <if test="qualificationId != null  and qualificationId != ''"> and cm_providers.qualificationId = #{qualificationId}</if>
-        </where>
-        group by cm_providers.id
-        order by cm_providers.createTime desc
-    </select>
-
-    <select id="getCount" parameterType="CmProviders" resultType="int">
-        select count(1)
-        from cm_providers AS cm_providers
+    <select id="getCmProvidersList" parameterType="com.caimei365.user.model.po.ServiceProviderModel" resultType="com.caimei365.user.model.po.ServiceProviderModel">
+        select
+        serviceProviderId,
+        name,
+        serviceLevel,
+        serviceCategory,
+        status,
+        userId,
+        address,
+        linkMan,
+        contractMobile as mobile,
+        text,
+        brandName,
+        qrCodeImage,
+        qualificationImage,
+        qualificationId,
+        createBy,
+        addTime,
+        splitCode
+        from serviceprovider
         <where>
-            <if test="id != null  and id != ''"> and cm_providers.id = #{id}</if>
-            <if test="userId != null "> and cm_providers.userId = #{userId}</if>
-            <if test="name != null  and name != ''"> and cm_providers.name like concat('%', #{name}, '%')</if>
-            <if test="serviceLevel != null "> and cm_providers.serviceLevel = #{serviceLevel}</if>
-            <if test="serviceCategory != null "> and cm_providers.serviceCategory = #{serviceCategory}</if>
-            <if test="address != null  and address != ''"> and cm_providers.address = #{address}</if>
-            <if test="linkMan != null  and linkMan != ''"> and cm_providers.linkMan = #{linkMan}</if>
-            <if test="mobile != null  and mobile != ''"> and cm_providers.mobile = #{mobile}</if>
-            <if test="status != null "> and cm_providers.status = #{status}</if>
-            <if test="text != null  and text != ''"> and cm_providers.text = #{text}</if>
-            <if test="qrCodeImage != null  and qrCodeImage != ''"> and cm_providers.qrCodeImage = #{qrCodeImage}</if>
-            <if test="qualificationImage != null  and qualificationImage != ''"> and cm_providers.qualificationImage = #{qualificationImage}</if>
-            <if test="qualificationId != null  and qualificationId != ''"> and cm_providers.qualificationId = #{qualificationId}</if>
+            <if test="serviceProviderId != null and serviceProviderId != ''">
+                and serviceProviderId = #{serviceProviderId}
+            </if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="serviceLevel != null ">and serviceLevel = #{serviceLevel}</if>
+            <if test="serviceCategory != null ">and cserviceCategory = #{serviceCategory}</if>
+            <if test="status != null ">and status = #{status}</if>
+            <if test="userId != null ">and userId = #{userId}</if>
+            <if test="address != null  and address != ''">and address = #{address}</if>
+            <if test="linkMan != null  and linkMan != ''">andlinkMan = #{linkMan}</if>
+            <if test="mobile != null  and mobile != ''">and contractMobile = #{mobile}</if>
         </where>
+        group by serviceProviderId
+        order by addTime desc
     </select>
 
-    <select id="getCmProvidersById" parameterType="String" resultMap="CmProvidersResult">
-        <include refid="selectCmProvidersVo"/>
-        from cm_providers AS cm_providers
-        where  cm_providers.id = #{id}
-    </select>
-
-
-    <select id="getById" parameterType="CmProviders" resultType="String">
-        select id
-        from cm_providers AS cm_providers
-        <where>
-            <if test="id != null  and id != ''"> and cm_providers.id = #{id}</if>
-            <if test="userId != null "> and cm_providers.userId = #{userId}</if>
-            <if test="name != null  and name != ''"> and cm_providers.name like concat('%', #{name}, '%')</if>
-            <if test="serviceLevel != null "> and cm_providers.serviceLevel = #{serviceLevel}</if>
-            <if test="serviceCategory != null "> and cm_providers.serviceCategory = #{serviceCategory}</if>
-            <if test="address != null  and address != ''"> and cm_providers.address = #{address}</if>
-            <if test="linkMan != null  and linkMan != ''"> and cm_providers.linkMan = #{linkMan}</if>
-            <if test="mobile != null  and mobile != ''"> and cm_providers.mobile = #{mobile}</if>
-            <if test="status != null "> and cm_providers.status = #{status}</if>
-            <if test="text != null  and text != ''"> and cm_providers.text = #{text}</if>
-            <if test="qrCodeImage != null  and qrCodeImage != ''"> and cm_providers.qrCodeImage = #{qrCodeImage}</if>
-            <if test="qualificationImage != null  and qualificationImage != ''"> and cm_providers.qualificationImage = #{qualificationImage}</if>
-            <if test="qualificationId != null  and qualificationId != ''"> and cm_providers.qualificationId = #{qualificationId}</if>
-        </where>
-        group by cm_providers.id
-        limit 0,1
+    <select id="getCmProvidersById" parameterType="String" resultType="com.caimei365.user.model.po.ServiceProviderModel">
+        select
+            serviceProviderId,
+            name,
+            serviceLevel,
+            serviceCategory,
+            status,
+            userId,
+            address,
+            linkMan,
+            contractMobile as mobile,
+            text,
+            brandName,
+            qrCodeImage,
+            qualificationImage,
+            qualificationId,
+            createBy,
+            addTime,
+            splitCode
+        from serviceprovider
+        where  serviceProviderId = #{id}
     </select>
 
-    <insert id="addCmProviders" parameterType="CmProviders" useGeneratedKeys="true" keyProperty="id">
-        insert into cm_providers
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">id,</if>
-            <if test="userId != null">userId,</if>
-            <if test="name != null and name != ''">name,</if>
-            <if test="serviceLevel != null">serviceLevel,</if>
-            <if test="serviceCategory != null">serviceCategory,</if>
-            <if test="address != null and address != ''">address,</if>
-            <if test="linkMan != null and linkMan != ''">linkMan,</if>
-            <if test="mobile != null and mobile != ''">mobile,</if>
-            <if test="status != null">status,</if>
-            <if test="text != null and text != ''">text,</if>
-            <if test="qrCodeImage != null and qrCodeImage != ''">qrCodeImage,</if>
-            <if test="qualificationImage != null and qualificationImage != ''">qualificationImage,</if>
-            <if test="qualificationId != null and qualificationId != ''">qualificationId,</if>
-            <if test="createBy != null and createBy != ''">createBy,</if>
-            <if test="updateTime != null">updateTime,</if>
-            <if test="createTime != null">createTime,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="name != null and name != ''">#{name},</if>
-            <if test="serviceLevel != null">#{serviceLevel},</if>
-            <if test="serviceCategory != null">#{serviceCategory},</if>
-            <if test="address != null and address != ''">#{address},</if>
-            <if test="linkMan != null and linkMan != ''">#{linkMan},</if>
-            <if test="mobile != null and mobile != ''">#{mobile},</if>
-            <if test="status != null">#{status},</if>
-            <if test="text != null and text != ''">#{text},</if>
-            <if test="qrCodeImage != null and qrCodeImage != ''">#{qrCodeImage},</if>
-            <if test="qualificationImage != null and qualificationImage != ''">#{qualificationImage},</if>
-            <if test="qualificationId != null and qualificationId != ''">#{qualificationId},</if>
-            <if test="createBy != null and createBy != ''">#{createBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="createTime != null">#{createTime},</if>
-        </trim>
-    </insert>
-
-    <update id="updateCmProviders" parameterType="CmProviders">
-        update cm_providers
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">userId = #{userId},</if>
-            <if test="name != null and name != ''">name = #{name},</if>
-            <if test="serviceLevel != null">serviceLevel = #{serviceLevel},</if>
-            <if test="serviceCategory != null">serviceCategory = #{serviceCategory},</if>
-            <if test="address != null and address != ''">address = #{address},</if>
-            <if test="linkMan != null and linkMan != ''">linkMan = #{linkMan},</if>
-            <if test="mobile != null and mobile != ''">mobile = #{mobile},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="text != null and text != ''">text = #{text},</if>
-            <if test="qrCodeImage != null and qrCodeImage != ''">qrCodeImage = #{qrCodeImage},</if>
-            <if test="qualificationImage != null and qualificationImage != ''">qualificationImage = #{qualificationImage},</if>
-            <if test="qualificationId != null and qualificationId != ''">qualificationId = #{qualificationId},</if>
-            <if test="createBy != null and createBy != ''">createBy = #{createBy},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-            <if test="createTime != null">createTime = #{createTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="delCmProvidersById" parameterType="String">
-        delete
-        from cm_providers where id = #{id}
-    </delete>
-
-    <delete id="delCmProviders" parameterType="CmProviders">
-        delete
-        from cm_providers AS cm_providers
-        <where>
-            <if test="id != null  and id != ''"> and cm_providers.id = #{id}</if>
-            <if test="userId != null "> and cm_providers.userId = #{userId}</if>
-            <if test="name != null  and name != ''"> and cm_providers.name like concat('%', #{name}, '%')</if>
-            <if test="serviceLevel != null "> and cm_providers.serviceLevel = #{serviceLevel}</if>
-            <if test="serviceCategory != null "> and cm_providers.serviceCategory = #{serviceCategory}</if>
-            <if test="address != null  and address != ''"> and cm_providers.address = #{address}</if>
-            <if test="linkMan != null  and linkMan != ''"> and cm_providers.linkMan = #{linkMan}</if>
-            <if test="mobile != null  and mobile != ''"> and cm_providers.mobile = #{mobile}</if>
-            <if test="status != null "> and cm_providers.status = #{status}</if>
-            <if test="text != null  and text != ''"> and cm_providers.text = #{text}</if>
-            <if test="qrCodeImage != null  and qrCodeImage != ''"> and cm_providers.qrCodeImage = #{qrCodeImage}</if>
-            <if test="qualificationImage != null  and qualificationImage != ''"> and cm_providers.qualificationImage = #{qualificationImage}</if>
-            <if test="qualificationId != null  and qualificationId != ''"> and cm_providers.qualificationId = #{qualificationId}</if>
-        </where>
-    </delete>
-
 </mapper>