协销服务商合并报错解决

src/main/java/com/caimei365/manager/controller/caimei/keyword/KeyWordApi.java

@@ -1,13 +1,12 @@
 package com.caimei365.manager.controller.caimei.keyword;
 
 import com.alibaba.excel.EasyExcel;
-import com.caimei365.manager.dao.KeyWordDao;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.CmKeywordInfo;
 import com.caimei365.manager.entity.caimei.CmPriorKeyword;
 import com.caimei365.manager.entity.caimei.KeyWord;
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.service.caimei.KeyWordService;
 import com.caimei365.manager.service.caimei.listener.KeywordListener;
 import com.caimei365.manager.service.caimei.listener.LabelListener;
@@ -19,7 +18,6 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Map;
 
 
 /**

src/main/java/com/caimei365/manager/controller/caimei/productArchive/ProductArchiveController.java

@@ -1,35 +1,19 @@
 package com.caimei365.manager.controller.caimei.productArchive;
 
-import com.caimei.utils.StringUtils;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.productArchive.CmProductArchive;
 import com.caimei365.manager.entity.caimei.productArchive.CmProductArchiveContent;
-import com.caimei365.manager.entity.caimei.providers.CmProviders;
 import com.caimei365.manager.service.caimei.productArchive.CmProductArchiveContentService;
 import com.caimei365.manager.service.caimei.productArchive.CmProductArchiveService;
-import com.caimei365.manager.service.caimei.providers.CmProvidersContractService;
-import com.caimei365.manager.service.caimei.providers.CmProvidersService;
-import com.caimei365.manager.utils.FFMPEG;
-import com.caimei365.manager.utils.ImageUtils;
-import com.caimei365.manager.utils.WaterMarkUtils;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.imageio.stream.ImageOutputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 /**

src/main/java/com/caimei365/manager/controller/caimei/providers/ProvidersApi.java

@@ -3,10 +3,9 @@ package com.caimei365.manager.controller.caimei.providers;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.cmUser.CmClub;
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.entity.caimei.product.Product;
 import com.caimei365.manager.entity.caimei.providers.CmProviderTeam;
-import com.caimei365.manager.entity.caimei.providers.CmProviders;
 import com.caimei365.manager.entity.caimei.providers.CmProvidersContract;
 import com.caimei365.manager.service.caimei.providers.CmProvidersContractService;
 import com.caimei365.manager.service.caimei.providers.CmProvidersService;
@@ -23,10 +22,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * 功能描述:服务商入驻Controller
- *
- * @auther: Kaick
- * @date: 2023/12/13 15:30
+ * 功能描述:服务商/协销功能已合并
  */
 @Validated
 @RestController
@@ -63,6 +59,7 @@ public class ProvidersApi {
 
     /**
      * 修改组长
+     *
      * @param team
      * @return
      */
@@ -141,8 +138,8 @@ public class ProvidersApi {
      * @return
      */
     @GetMapping("/clubList")
-    public ResponseJson<PaginationVo<CmClub>> clubList(@NotNull(message = "协销Id不能为空") Integer spId,
-                                                       Integer clubId, String name, String linkMan, String bindMobile,
+    public ResponseJson<PaginationVo<CmClub>> clubList(@NotNull(message = "协销Id不能为空") Integer spId, Integer clubId,
+                                                       String name, String linkMan, String bindMobile,
                                                        @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                        @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return cmProvidersService.clubList(spId, clubId, name, linkMan, bindMobile, pageNum, pageSize);
@@ -161,14 +158,14 @@ public class ProvidersApi {
      * @return
      */
     @GetMapping("/product/list")
-    public ResponseJson<PaginationVo<Product>> providersProductList(Integer providerId,
+    public ResponseJson<PaginationVo<Product>> providersProductList(Integer serviceProviderId,
                                                                     String shopName,
                                                                     String productName,
                                                                     Integer productId,
                                                                     Integer shopId,
                                                                     @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                     @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-        return cmProvidersService.getProviderProducts(providerId, shopName, productName, productId, shopId, pageNum, pageSize);
+        return cmProvidersService.getProviderProducts(serviceProviderId, shopName, productName, productId, shopId, pageNum, pageSize);
     }
 
     /**
@@ -181,22 +178,21 @@ public class ProvidersApi {
      * @return
      */
     @GetMapping("/products")
-    public ResponseJson<PaginationVo<Product>> providersProducts(@NotNull(message = "服务商Id不能为空") Integer providerId,
-                                                                 String productName,
-                                                                 Integer productId,
+    public ResponseJson<PaginationVo<Product>> providersProducts(@NotNull(message = "服务商Id不能为空") Integer serviceProviderId,
+                                                                 String productName, Integer productId,
                                                                  @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                  @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-        return cmProvidersService.getProviderProductList(providerId, productName, productId, pageNum, pageSize);
+        return cmProvidersService.getProviderProductList(serviceProviderId, productName, productId, pageNum, pageSize);
     }
 
     @GetMapping("/add/products")
-    public ResponseJson addProvidersProducts(Integer providerId, String productIds) {
-        return cmProvidersService.addProvidersProducts(providerId, productIds);
+    public ResponseJson addProvidersProducts(Integer serviceProviderId, String productIds) {
+        return cmProvidersService.addProvidersProducts(serviceProviderId, productIds);
     }
 
     @GetMapping("/del/products")
-    public ResponseJson delProvidersProducts(Integer providerId, Integer productId) {
-        return cmProvidersService.delProvidersProducts(providerId, productId);
+    public ResponseJson delProvidersProducts(Integer serviceProviderId, Integer productId) {
+        return cmProvidersService.delProvidersProducts(serviceProviderId, productId);
     }
 
     @GetMapping("/list")
@@ -209,48 +205,37 @@ public class ProvidersApi {
                                       @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                       @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<CmProviders> cmProvidersList = cmProvidersService.getCmProvidersList(new CmProviders()
-                .setName(name)
-                .setServiceLevel(serviceLevel)
-                .setServiceCategory(serviceCategory)
-                .setQualificationId(qualificationId)
-                .setContractStartDate(contractStartDate)
-                .setContractEndDate(contractEndDate)
-        );
+        List<ServiceProviderModel> cmProvidersList = cmProvidersService.getCmProvidersList(
+                new ServiceProviderModel().setName(name).setServiceLevel(serviceLevel).setServiceCategory(serviceCategory)
+                        .setQualificationId(qualificationId).setContractStartDate(contractStartDate).setContractEndDate(contractEndDate));
         return ResponseJson.success(new PaginationVo(cmProvidersList));
     }
 
     @GetMapping("/contract/list")
     public ResponseJson providersContractList(String contractId,
-                                              @NotNull(message = "服务商ID不能为空") Integer providersId,
-                                              Date contractStartDate,
-                                              Date contractEndDate,
+                                              @NotNull(message = "服务商ID不能为空") Integer serviceProviderId,
+                                              Date contractStartDate, Date contractEndDate,
                                               @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                               @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<CmProvidersContract> cmProvidersContractList = cmProvidersContractService.getCmProvidersContractList(new CmProvidersContract()
-                .setContractId(contractId)
-                .setProvidersId(providersId)
-                .setContractStartDate(contractStartDate)
-                .setContractEndDate(contractEndDate)
-        );
+        List<CmProvidersContract> cmProvidersContractList = cmProvidersContractService.getCmProvidersContractList(
+                new CmProvidersContract().setContractId(contractId).setProvidersId(serviceProviderId)
+                        .setContractStartDate(contractStartDate).setContractEndDate(contractEndDate));
         return ResponseJson.success(new PaginationVo(cmProvidersContractList));
     }
 
     @GetMapping("/from")
-    public ResponseJson providersFrom(String providersId) {
-        if (StringUtils.isBlank(providersId)
-        ) {
+    public ResponseJson providersFrom(String serviceProvidersId) {
+        if (StringUtils.isBlank(serviceProvidersId)) {
             return ResponseJson.error("参数异常！");
         }
-        CmProviders providers = cmProvidersService.getCmProvidersById(providersId);
+        ServiceProviderModel providers = cmProvidersService.getCmProvidersById(serviceProvidersId);
         return ResponseJson.success(providers);
     }
 
     @GetMapping("/contract/from")
     public ResponseJson providersContractFrom(String providersContractId) {
-        if (StringUtils.isBlank(providersContractId)
-        ) {
+        if (StringUtils.isBlank(providersContractId)) {
             return ResponseJson.error("参数异常！");
         }
         CmProvidersContract providersContract = cmProvidersContractService.getCmProvidersContractById(providersContractId);
@@ -258,17 +243,10 @@ public class ProvidersApi {
     }
 
     @PostMapping("/add")
-    public ResponseJson providersAdd(@RequestBody CmProviders cmProviders
-    ) {
-        if (null == cmProviders.getName() ||
-                null == cmProviders.getLinkMan() ||
-                null == cmProviders.getMobile() ||
-                null == cmProviders.getServiceLevel() ||
-                null == cmProviders.getServiceCategory() ||
-                null == cmProviders.getAddress() ||
-                null == cmProviders.getTextRelateds() ||
-                null == cmProviders.getInfoRelateds()
-        ) {
+    public ResponseJson providersAdd(@RequestBody ServiceProviderModel cmProviders) {
+        if (null == cmProviders.getName() || null == cmProviders.getMobile() || null == cmProviders.getServiceLevel()
+                || null == cmProviders.getServiceCategory() || null == cmProviders.getAddress()
+                || null == cmProviders.getTextRelateds() || null == cmProviders.getInfoRelateds()) {
             return ResponseJson.error("参数异常！");
         }
         cmProvidersService.addCmProviders(cmProviders);
@@ -281,22 +259,16 @@ public class ProvidersApi {
             return ResponseJson.error("ID不能为空！");
         }
         for (String userId : userIds.split(",")) {
-            cmProvidersService.updateCmProviders(new CmProviders()
-                    .setUserId(Integer.valueOf(userId))
-                    .setStatus(status == 90 ? 90 : 91)
-            );
+            cmProvidersService.updateCmProviders(new ServiceProviderModel().setUserId(Integer.valueOf(userId)).setStatus(status == 90 ? 90 : 91));
         }
         return ResponseJson.success();
     }
 
     @PostMapping("/contract/add")
     public ResponseJson providersContractAdd(@RequestBody CmProvidersContract cmProvidersContract) {
-        if (null == cmProvidersContract.getProvidersId() ||
-                null == cmProvidersContract.getContractId() ||
-                null == cmProvidersContract.getContractStartDate() ||
-                null == cmProvidersContract.getContractEndDate() ||
-                null == cmProvidersContract.getContractRelateds()
-        ) {
+        if (null == cmProvidersContract.getProvidersId() || null == cmProvidersContract.getContractId()
+                || null == cmProvidersContract.getContractStartDate()
+                || null == cmProvidersContract.getContractEndDate() || null == cmProvidersContract.getContractRelateds()) {
             return ResponseJson.error("参数异常！");
         }
         cmProvidersContractService.addCmProvidersContract(cmProvidersContract);

src/main/java/com/caimei365/manager/dao/KeyWordDao.java

@@ -4,11 +4,10 @@ import com.caimei365.manager.entity.caimei.CmKeywordInfo;
 import com.caimei365.manager.entity.caimei.CmKeywordSubtag;
 import com.caimei365.manager.entity.caimei.CmPriorKeyword;
 import com.caimei365.manager.entity.caimei.KeyWord;
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/caimei365/manager/dao/providers/CmProvidersContractMapper.java

@@ -13,8 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * @date 2023-12-12
  */
 @Mapper
-public interface CmProvidersContractMapper
-{
+public interface CmProvidersContractMapper {
     /**
      * 通过对象查询列表
      *

src/main/java/com/caimei365/manager/dao/providers/CmProvidersMapper.java

@@ -3,10 +3,9 @@ package com.caimei365.manager.dao.providers;
 import java.util.List;
 
 import com.caimei365.manager.entity.caimei.cmUser.CmClub;
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.entity.caimei.product.Product;
 import com.caimei365.manager.entity.caimei.providers.CmProviderTeam;
-import com.caimei365.manager.entity.caimei.providers.CmProviders;
 import com.caimei365.manager.entity.po.UploadFilePo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,7 +24,7 @@ public interface CmProvidersMapper {
      * @param cmProviders
      * @return 集合
      */
-    List<CmProviders> getCmProvidersList(CmProviders cmProviders);
+    List<ServiceProviderModel> getCmProvidersList(ServiceProviderModel cmProviders);
 
     /**
      * 通过Id查询对象
@@ -33,7 +32,7 @@ public interface CmProvidersMapper {
      * @param id 主键
      * @return
      */
-    CmProviders getCmProvidersById(String id);
+    ServiceProviderModel getCmProvidersById(String id);
 
     /**
      * 通过对象查询对象
@@ -41,16 +40,7 @@ public interface CmProvidersMapper {
      * @param cmProviders
      * @return
      */
-    CmProviders getByCmProviders(CmProviders cmProviders);
-
-    /**
-     * 通过对象查询Id
-     *
-     * @param cmProviders
-     * @return String
-     */
-    String getById(CmProviders cmProviders);
-
+    ServiceProviderModel getByCmProviders(ServiceProviderModel cmProviders);
 
     /**
      * 通过对象查询记录总数
@@ -58,7 +48,7 @@ public interface CmProvidersMapper {
      * @param cmProviders
      * @return Integer
      */
-    int getCount(CmProviders cmProviders);
+    int getCount(ServiceProviderModel cmProviders);
 
     /**
      * 新增
@@ -66,7 +56,7 @@ public interface CmProvidersMapper {
      * @param cmProviders
      * @return 结果
      */
-    int addCmProviders(CmProviders cmProviders);
+    int addCmProviders(ServiceProviderModel cmProviders);
 
     /**
      * 修改
@@ -74,7 +64,7 @@ public interface CmProvidersMapper {
      * @param cmProviders
      * @return 结果
      */
-    int updateCmProviders(CmProviders cmProviders);
+    int updateCmProviders(ServiceProviderModel cmProviders);
 
     /**
      * 删除
@@ -84,14 +74,6 @@ public interface CmProvidersMapper {
      */
     int delCmProvidersById(String id);
 
-    /**
-     * 批量删除
-     *
-     * @param  需要删除的数据主键集合
-     * @return 结果
-     */
-    int delCmProviders(CmProviders cmProviders);
-
     /**
      * 批量删除
      *

src/main/java/com/caimei365/manager/dao/user/CmClubRemarksDao.java

@@ -2,6 +2,7 @@ package com.caimei365.manager.dao.user;
 
 import com.caimei365.manager.entity.caimei.cmUser.*;
 import com.caimei365.manager.entity.caimei.product.Product;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/caimei365/manager/entity/caimei/CmRelatedImage.java

@@ -1,10 +1,12 @@
 package com.caimei365.manager.entity.caimei;
 
 import java.io.Serializable;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.apache.ibatis.type.Alias;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 
 /**
@@ -13,14 +15,15 @@ import java.util.Date;
  * @author Kaick
  * @date 2023-12-12
  */
-@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;
 
     /**
@@ -56,7 +59,9 @@ public class CmRelatedImage implements Serializable
     @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/manager/entity/caimei/cmUser/CmSaleMan.java

@@ -1,5 +1,6 @@
 package com.caimei365.manager.entity.caimei.cmUser;
 
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

src/main/java/com/caimei365/manager/entity/caimei/cmUser/ServiceProviderModel.java

@@ -1,49 +0,0 @@
-package com.caimei365.manager.entity.caimei.cmUser;
-
-import lombok.Data;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2023/9/7
- */
-@Data
-public class ServiceProviderModel {
-
-    private Integer leaderId;
-
-    private String mobile;
-    /**
-     * 协销Id
-     */
-    private Integer serviceProviderId;
-    /**
-     * 协销名称
-     */
-    private String name;
-    /**
-     * 协销联系人名称
-     */
-    private String linkMan;
-    /**
-     * 协销用户Id
-     */
-    private Integer userId;
-    /**
-     * 协销组长Id
-     */
-    private Integer mainServiceProviderId;
-    /**
-     * 协销组长名称
-     */
-    private String mainName;
-    /**
-     * 已注册客户数
-     */
-    private Integer registeredNumber;
-    /**
-     * 未注册客户数
-     */
-    private Integer unregisteredNumber;
-}

src/main/java/com/caimei365/manager/entity/caimei/cmUser/VisitRemarkVo.java

@@ -1,6 +1,7 @@
 package com.caimei365.manager.entity.caimei.cmUser;
 
 import com.caimei365.manager.entity.caimei.product.Product;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

src/main/java/com/caimei365/manager/entity/caimei/providers/CmProviderTeam.java

@@ -1,6 +1,5 @@
 package com.caimei365.manager.entity.caimei.providers;
 
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 

src/main/java/com/caimei365/manager/entity/caimei/providers/CmProvidersContract.java

@@ -18,27 +18,36 @@ import org.apache.ibatis.type.Alias;
  * @author Kaick
  * @date 2023-12-12
  */
-@Accessors(chain  = true )
+@Accessors(chain = true)
 @Data
 @Alias("CmProvidersContract")
-public class CmProvidersContract implements Serializable
-{
+public class CmProvidersContract implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    /**
+     * id
+     */
     private String id;
 
-    /** 服务商id */
+    /**
+     * 服务商id
+     */
     private Integer providersId;
 
-    /** 合同编号 */
+    /**
+     * 合同编号
+     */
     private String contractId;
 
-    /** 合同起始日期 */
+    /**
+     * 合同起始日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date contractStartDate;
 
-    /** 合同截止日期 */
+    /**
+     * 合同截止日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date contractEndDate;
 
@@ -68,7 +77,7 @@ public class CmProvidersContract implements Serializable
     /**
      * 是否新增标志
      */
-    private Boolean flag=true;
+    private Boolean flag = true;
 
 
 }

src/main/java/com/caimei365/manager/entity/caimei/providers/CmProviders.java → src/main/java/com/caimei365/manager/entity/caimei/providers/ServiceProviderModel.java

@@ -1,53 +1,61 @@
 package com.caimei365.manager.entity.caimei.providers;
 
-import java.io.Serializable;
-
 import com.caimei365.manager.entity.caimei.CmRelatedImage;
+import com.caimei365.manager.entity.caimei.providers.CmProvidersContract;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.apache.ibatis.type.Alias;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
 import java.util.List;
 
 /**
- * 对象 cm_providers
+ * Description
  *
- * @author Kaick
- * @date 2023-12-12
+ * @author : Charles
+ * @date : 2023/9/7
  */
 @Accessors(chain = true)
 @Data
-@Alias("CmProviders")
-public class CmProviders implements Serializable {
-    private static final long serialVersionUID = 1L;
+public class ServiceProviderModel {
+
+    private Integer leaderId;
+
+    private String linkMan;
 
+    private String mobile;
     /**
-     * id
+     * 协销Id
      */
-    private String id;
-
+    private Integer serviceProviderId;
+    /**
+     * 协销名称
+     */
+    private String name;
     /**
-     * 用户Id
+     * 协销用户Id
      */
     private Integer userId;
-
     /**
-     * 服务商名称
+     * 协销组长名称
      */
-    private String name;
-
+    private String mainName;
+    /**
+     * 已注册客户数
+     */
+    private Integer registeredNumber;
+    /**
+     * 未注册客户数
+     */
+    private Integer unregisteredNumber;
     /**
      * 服务商级别为：1级，2级，3级，4 特约服务商,5品牌指定服务商
      */
     private Integer serviceLevel;
-
     /**
      * 特约品牌名称
      */
     private String brandName;
-
     /**
      * 服务商类型: 1个人，2企业
      */
@@ -56,22 +64,10 @@ public class CmProviders implements Serializable {
      * 状态：90上线，91下线
      */
     private Integer status;
-
     /**
      * 服务商地址
      */
     private String address;
-
-    /**
-     * 联系人
-     */
-    private String linkMan;
-
-    /**
-     * 联系电话
-     */
-    private String mobile;
-
     /**
      * 简介
      */
@@ -81,34 +77,25 @@ public class CmProviders implements Serializable {
      * 服务商二维码
      */
     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 Date addTime;
 
     /**
      * 相关简介图集合
@@ -144,6 +131,3 @@ public class CmProviders implements Serializable {
      */
     private String splitCode;
 }
-
-
-

src/main/java/com/caimei365/manager/service/caimei/KeyWordService.java

@@ -5,10 +5,9 @@ import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.CmKeywordInfo;
 import com.caimei365.manager.entity.caimei.CmPriorKeyword;
 import com.caimei365.manager.entity.caimei.KeyWord;
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author zzj

src/main/java/com/caimei365/manager/service/caimei/impl/KeyWordServiceImpl.java

@@ -9,7 +9,7 @@ import com.caimei365.manager.entity.caimei.CmKeywordInfo;
 import com.caimei365.manager.entity.caimei.CmKeywordSubtag;
 import com.caimei365.manager.entity.caimei.CmPriorKeyword;
 import com.caimei365.manager.entity.caimei.KeyWord;
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.entity.caimei.enums.KeyWordEnum;
 import com.caimei365.manager.service.caimei.KeyWordService;
 import com.github.pagehelper.PageHelper;
@@ -19,12 +19,9 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author zzj

src/main/java/com/caimei365/manager/service/caimei/providers/CmProvidersService.java

@@ -3,11 +3,9 @@ package com.caimei365.manager.service.caimei.providers;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.cmUser.CmClub;
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
-import com.caimei365.manager.entity.caimei.cmUser.User;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.entity.caimei.product.Product;
 import com.caimei365.manager.entity.caimei.providers.CmProviderTeam;
-import com.caimei365.manager.entity.caimei.providers.CmProviders;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,7 +24,7 @@ public interface CmProvidersService {
      * @param cmProviders
      * @return 集合
      */
-    List<CmProviders> getCmProvidersList(CmProviders cmProviders);
+    List<ServiceProviderModel> getCmProvidersList(ServiceProviderModel cmProviders);
 
     /**
      * 通过Id查询
@@ -34,7 +32,7 @@ public interface CmProvidersService {
      * @param id 主键
      * @return
      */
-    CmProviders getCmProvidersById(String id);
+    ServiceProviderModel getCmProvidersById(String id);
 
     /**
      * 通过对象查询
@@ -42,7 +40,7 @@ public interface CmProvidersService {
      * @param cmProviders
      * @return
      */
-    CmProviders getByCmProviders(CmProviders cmProviders);
+    ServiceProviderModel getByCmProviders(ServiceProviderModel cmProviders);
 
 
     /**
@@ -51,7 +49,7 @@ public interface CmProvidersService {
      * @param cmProviders
      * @return 结果
      */
-    int addCmProviders(CmProviders cmProviders);
+    int addCmProviders(ServiceProviderModel cmProviders);
 
     /**
      * 修改
@@ -59,7 +57,7 @@ public interface CmProvidersService {
      * @param cmProviders
      * @return 结果
      */
-    int updateCmProviders(CmProviders cmProviders);
+    int updateCmProviders(ServiceProviderModel cmProviders);
 
     /**
      * 下載圖片

src/main/java/com/caimei365/manager/service/caimei/providers/impl/CmProvidersContractServiceImpl.java

@@ -1,8 +1,6 @@
 package com.caimei365.manager.service.caimei.providers.impl;
 
 import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.net.URL;
 import java.util.Date;
 import java.util.List;
 
@@ -11,8 +9,8 @@ import com.caimei365.manager.dao.CmRelatedImageMapper;
 import com.caimei365.manager.dao.providers.CmProvidersContractMapper;
 import com.caimei365.manager.dao.providers.CmProvidersMapper;
 import com.caimei365.manager.entity.caimei.CmRelatedImage;
-import com.caimei365.manager.entity.caimei.providers.CmProviders;
 import com.caimei365.manager.entity.caimei.providers.CmProvidersContract;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.service.caimei.providers.CmProvidersContractService;
 import com.caimei365.manager.utils.ImageUtils;
 import com.caimei365.manager.service.caimei.providers.utils.ProvidersTemplate;
@@ -20,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.imageio.ImageIO;
 
 /**
  * Service业务层处理
@@ -86,11 +83,11 @@ public class CmProvidersContractServiceImpl implements CmProvidersContractServic
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int addCmProvidersContract(CmProvidersContract cmProvidersContract) {
-        CmProviders cmProviders = cmProvidersMapper.getCmProvidersById(String.valueOf(cmProvidersContract.getProvidersId()));
+        ServiceProviderModel cmProviders = cmProvidersMapper.getCmProvidersById(String.valueOf(cmProvidersContract.getProvidersId()));
         String levelName = cmProviders.getServiceLevel() == 1 ? "一级" : cmProviders.getServiceLevel() == 2 ? "二级" : cmProviders.getServiceLevel() == 3 ? "三级" : cmProviders.getBrandName();
         BufferedImage realQrCodeImage = ImageUtils.createRealQrCode("https://www.caimei365.com/settlementInfo.html?id=" + cmProvidersContract.getProvidersId(), 1000);                //生成二维码
-        cmProvidersMapper.updateCmProviders(new CmProviders()
-                .setId(String.valueOf(cmProvidersContract.getProvidersId()))
+        cmProvidersMapper.updateCmProviders(new ServiceProviderModel()
+                .setServiceProviderId(cmProvidersContract.getProvidersId())
                 .setQrCodeImage(FastDFSClient.saveImage(realQrCodeImage))
                 .setQualificationImage(ProvidersTemplate.setQualificationImage(cmProviders.getServiceLevel(),
                         cmProviders.getName().replace("公司", ""),    //生成资格证书

src/main/java/com/caimei365/manager/service/caimei/providers/impl/CmProvidersServiceImpl.java

@@ -1,7 +1,6 @@
 package com.caimei365.manager.service.caimei.providers.impl;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -19,11 +18,10 @@ import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.CmRelatedImage;
 import com.caimei365.manager.entity.caimei.cmUser.CmClub;
-import com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.entity.caimei.cmUser.User;
 import com.caimei365.manager.entity.caimei.product.Product;
 import com.caimei365.manager.entity.caimei.providers.CmProviderTeam;
-import com.caimei365.manager.entity.caimei.providers.CmProviders;
 import com.caimei365.manager.entity.caimei.providers.CmProvidersContract;
 import com.caimei365.manager.entity.po.UploadFilePo;
 import com.caimei365.manager.service.caimei.providers.CmProvidersContractService;
@@ -70,7 +68,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
      * @return
      */
     @Override
-    public List<CmProviders> getCmProvidersList(CmProviders cmProviders) {
+    public List<ServiceProviderModel> getCmProvidersList(ServiceProviderModel cmProviders) {
         return cmProvidersMapper.getCmProvidersList(cmProviders);
     }
 
@@ -81,10 +79,10 @@ public class CmProvidersServiceImpl implements CmProvidersService {
      * @return
      */
     @Override
-    public CmProviders getCmProvidersById(String id) {
-        CmProviders cmProvidersById = cmProvidersMapper.getCmProvidersById(id);
-        cmProvidersById.setTextRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("2").setAuthorId(cmProvidersById.getId())));
-        cmProvidersById.setInfoRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("3").setAuthorId(cmProvidersById.getId())));
+    public ServiceProviderModel getCmProvidersById(String id) {
+        ServiceProviderModel cmProvidersById = cmProvidersMapper.getCmProvidersById(id);
+        cmProvidersById.setTextRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("2").setAuthorId(cmProvidersById.getServiceProviderId().toString())));
+        cmProvidersById.setInfoRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("3").setAuthorId(cmProvidersById.getServiceProviderId().toString())));
         return cmProvidersById;
     }
 
@@ -95,10 +93,10 @@ public class CmProvidersServiceImpl implements CmProvidersService {
      * @return
      */
     @Override
-    public CmProviders getByCmProviders(CmProviders cmProviders) {
-        CmProviders providers = cmProvidersMapper.getByCmProviders(cmProviders);
-        providers.setTextRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("2").setAuthorId(cmProviders.getId())));
-        providers.setInfoRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("3").setAuthorId(cmProviders.getId())));
+    public ServiceProviderModel getByCmProviders(ServiceProviderModel cmProviders) {
+        ServiceProviderModel providers = cmProvidersMapper.getByCmProviders(cmProviders);
+        providers.setTextRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("2").setAuthorId(cmProviders.getServiceProviderId().toString())));
+        providers.setInfoRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("3").setAuthorId(cmProviders.getServiceProviderId().toString())));
         return providers;
     }
 
@@ -111,8 +109,8 @@ public class CmProvidersServiceImpl implements CmProvidersService {
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public int addCmProviders(CmProviders cmProviders) {
-        if (StringUtils.isBlank(cmProviders.getId())) {
+    public int addCmProviders(ServiceProviderModel cmProviders) {
+        if (StringUtils.isBlank(cmProviders.getServiceProviderId().toString())) {
             User user = new User();
             user.setBindMobile(cmProviders.getMobile());
             user.setUserName(cmProviders.getLinkMan());
@@ -134,9 +132,9 @@ public class CmProvidersServiceImpl implements CmProvidersService {
             }
             cmProviders.setQualificationId(qualificationId);
             cmProviders.setStatus(90);
-            cmProviders.setCreateTime(new Date());
+            cmProviders.setAddTime(new Date());
             cmProvidersMapper.addCmProviders(cmProviders);   //新增服务商
-            String providersId = cmProviders.getId();
+            String providersId = cmProviders.getServiceProviderId().toString();
             cmProviders.getContract().setProvidersId(Integer.valueOf(providersId));
             cmProviders.getContract().setCreateBy(cmProviders.getCreateBy());
             cmProvidersContractService.addCmProvidersContract(cmProviders.getContract()); //新增服务商合同
@@ -156,7 +154,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
             userMapper.updateUser(user);
             String qualificationId = new StringBuffer(cmProviders.getQualificationId()).replace(5, 6, cmProviders.getServiceLevel().toString()).toString();
             cmProviders.setQualificationId(qualificationId);
-            CmRelatedImage cmRelatedImage = new CmRelatedImage().setType("3").setAuthorId(cmProviders.getId());
+            CmRelatedImage cmRelatedImage = new CmRelatedImage().setType("3").setAuthorId(cmProviders.getServiceProviderId().toString());
             cmRelatedImageMapper.delCmRelatedImage(cmRelatedImage);      //删除旧服务资料文件
             cmRelatedImage.setType("2");
             cmRelatedImageMapper.delCmRelatedImage(cmRelatedImage);      //删除旧服务商简介图
@@ -168,7 +166,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
                 cmRelatedImageMapper.addCmRelatedImage(cmRelatedImage.setImage(infoRelatedImage.getImage()).setFileName(infoRelatedImage.getFileName()));       //新增服务资料文件
             }
             cmProvidersMapper.updateCmProviders(cmProviders);
-            CmProvidersContract contract = cmProvidersContractMapper.getByCmProvidersContract(new CmProvidersContract().setProvidersId(Integer.valueOf(cmProviders.getId())));
+            CmProvidersContract contract = cmProvidersContractMapper.getByCmProvidersContract(new CmProvidersContract().setProvidersId(cmProviders.getServiceProviderId()));
             contract.setFlag(false);//更改新增标识
             cmProvidersContractService.addCmProvidersContract(contract); //新增服务商合同
             return 1;
@@ -182,11 +180,10 @@ public class CmProvidersServiceImpl implements CmProvidersService {
      * @return 结果
      */
     @Override
-    public int updateCmProviders(CmProviders cmProviders) {
+    public int updateCmProviders(ServiceProviderModel cmProviders) {
         if (null != cmProviders.getStatus()) {
             userMapper.updateUser(new User().setUserID(String.valueOf(cmProviders.getUserId())).setValidFlag(cmProviders.getStatus() == 90 ? "1" : "0"));
         }
-        cmProviders.setUpdateTime(new Date());
         return cmProvidersMapper.updateCmProviders(cmProviders);
     }
 

src/main/java/com/caimei365/manager/service/caimei/user/impl/CmClubRemarksServiceImpl.java

@@ -1,19 +1,18 @@
 package com.caimei365.manager.service.caimei.user.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.caimei.utils.AppUtils;
 import com.caimei.utils.MathUtil;
 import com.caimei365.manager.dao.user.CmClubRemarksDao;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.cmUser.*;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.service.caimei.CmOssArchiveService;
 import com.caimei365.manager.service.caimei.user.CmClubRemarksService;
 import com.caimei365.manager.utils.OSSUtils;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -23,8 +22,6 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Description
@@ -87,7 +84,6 @@ public class CmClubRemarksServiceImpl implements CmClubRemarksService {
         // 全部协销的数据
         ServiceProviderModel service = new ServiceProviderModel();
         service.setName("全部");
-        service.setLinkMan("全部");
         service.setRegisteredNumber(registeredNumber.get());
         service.setUnregisteredNumber(unRegisteredNumber.get());
         // 在首位加入总数数据

src/main/resources/mapper/KeyWordDao.xml

@@ -140,13 +140,13 @@
         limit 1
     </select>
 
-    <select id="getServiceList" resultType="com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel">
+    <select id="getServiceList" resultType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
         SELECT
             ser.serviceProviderID AS serviceProviderId,
             ser.linkMan,
             ser.userID AS userId
         FROM serviceprovider ser
-        WHERE ser.organizeId = 0 AND ser.validFlag = 1 AND ser.status = 90 GROUP BY ser.serviceProviderID
+        WHERE ser.organizeId = 0 AND ser.status = 90 GROUP BY ser.serviceProviderID
         order by ser.addTime asc
     </select>
 

src/main/resources/mapper/providers/CmProvidersMapper.xml

@@ -4,164 +4,138 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.manager.dao.providers.CmProvidersMapper">
 
-    <resultMap type="CmProviders" id="CmProvidersResult">
-        <result property="id" column="id"/>
-        <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="text" column="text"/>
-        <result property="qrCodeImage" column="qrCodeImage"/>
-        <result property="qualificationImage" column="qualificationImage"/>
-        <result property="qualificationId" column="qualificationId"/>
-        <result property="contractStartDate" column="contractStartDate"/>
-        <result property="contractEntDate" column="contractEntDate"/>
-        <result property="createBy" column="createBy"/>
-        <result property="updateTime" column="updateTime"/>
-        <result property="createTime" column="createTime"/>
-        <result property="userId" column="userId"/>
-        <result property="status" column="status"/>
-    </resultMap>
-
-    <sql id="selectCmProvidersVo">
-        select cm_providers.id,
-               cm_providers.name,
-               cm_providers.serviceLevel,
-               cm_providers.serviceCategory,
-               cm_providers.status,
-               cm_providers.userId,
-               cm_providers.address,
-               cm_providers.linkMan,
-               cm_providers.mobile,
-               cm_providers.text,
-               cm_providers.brandName,
-               cm_providers.qrCodeImage,
-               cm_providers.qualificationImage,
-               cm_providers.qualificationId,
-               cm_providers.createBy,
-               cm_providers.updateTime,
-               cm_providers.createTime,
-               cm_providers.splitCode
-    </sql>
-
-    <select id="getByCmProviders" parameterType="CmProviders" resultMap="CmProvidersResult">
-        <include refid="selectCmProvidersVo"/>
-        from cm_providers AS cm_providers
+    <select id="getByCmProviders" parameterType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel"
+            resultType="com.caimei365.manager.entity.caimei.providers.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="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="status != null ">and cm_providers.status = #{status}</if>
-            <if test="userId != null ">and cm_providers.userId = #{userId}</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="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
-        order by cm_providers.createTime desc
+        group by serviceProviderId
+        order by addTime desc
         limit 0,1
     </select>
 
-    <select id="getCmProvidersList" parameterType="CmProviders" resultMap="CmProvidersResult">
-        <include refid="selectCmProvidersVo"/>
-        ,cm_providers_contract.contractStartDate
-        ,cm_providers_contract.contractEndDate
-        from cm_providers AS cm_providers
-        LEFT JOIN cm_providers_contract as cm_providers_contract ON cm_providers_contract.providersId = cm_providers.id
+    <select id="getCmProvidersList" parameterType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel"
+            resultType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
+        select
+        sp.serviceProviderId,
+        sp.name,
+        sp.serviceLevel,
+        sp.serviceCategory,
+        sp.status,
+        sp.userId,
+        sp.address,
+        sp.linkMan,
+        sp.contractMobile as mobile,
+        sp.text,
+        sp.brandName,
+        sp.qrCodeImage,
+        sp.qualificationImage,
+        sp.qualificationId,
+        sp.createBy,
+        sp.addTime,
+        sp.splitCode,
+        cm_providers_contract.contractStartDate,
+        cm_providers_contract.contractEndDate
+        from serviceprovider AS sp
+        LEFT JOIN cm_providers_contract as cm_providers_contract ON cm_providers_contract.providersId =
+        sp.serviceProviderId
         <where>
-            <if test="id != null  and id != ''">and cm_providers.id = #{id}</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="status != null ">and cm_providers.status = #{status}</if>
-            <if test="userId != null ">and cm_providers.userId = #{userId}</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="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="contractStartDate != null ">and cm_providers_contract.contractStartDate >= #{contractStartDate}
-            </if>
-            <if test="contractEndDate != null ">and cm_providers_contract.contractEndDate  <![CDATA[ <= ]]>
-                #{contractEndDate}
+            <if test="serviceProviderId != null and serviceProviderId != ''">
+                and sp.serviceProviderId = #{serviceProviderId}
+            </if>
+            <if test="name != null  and name != ''">and sp.name like concat('%', #{name}, '%')</if>
+            <if test="serviceLevel != null ">and sp.serviceLevel = #{serviceLevel}</if>
+            <if test="status != null ">and sp.status = #{status}</if>
+            <if test="userId != null ">and sp.userId = #{userId}</if>
+            <if test="serviceCategory != null ">and sp.serviceCategory = #{serviceCategory}</if>
+            <if test="address != null  and address != ''">and sp.address = #{address}</if>
+            <if test="linkMan != null  and linkMan != ''">and sp.linkMan = #{linkMan}</if>
+            <if test="mobile != null  and mobile != ''">and sp.contractMobile = #{mobile}</if>
+            <if test="qualificationId != null  and qualificationId != ''">
+                and sp.qualificationId = #{qualificationId}
+            </if>
+            <if test="contractStartDate != null ">
+                and cm_providers_contract.contractStartDate >= #{contractStartDate}
+            </if>
+            <if test="contractEndDate != null ">
+                and cm_providers_contract.contractEndDate  <![CDATA[ <= ]]> #{contractEndDate}
             </if>
         </where>
-        group by cm_providers.id
-        order by cm_providers.createTime desc
+        group by sp.serviceProviderId
+        order by sp.addTime desc
     </select>
 
-    <select id="getCount" parameterType="CmProviders" resultType="int">
+    <select id="getCount" parameterType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel"
+            resultType="int">
         select count(1)
-        from cm_providers AS cm_providers
+        from serviceprovider
         <where>
-            <if test="id != null  and id != ''">and cm_providers.id = #{id}</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="userId != null ">and cm_providers.userId = #{userId}</if>
-            <if test="status != null ">and cm_providers.status = #{status}</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="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 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="userId != null ">and userId = #{userId}</if>
+            <if test="status != null ">and status = #{status}</if>
+            <if test="serviceCategory != null ">and serviceCategory = #{serviceCategory}</if>
+            <if test="address != null and address != ''">and address = #{address}</if>
+            <if test="mobile != null and mobile != ''">and contractMobile = #{mobile}</if>
+            <if test="qualificationId != null and qualificationId != ''">
+                and qualificationId = #{qualificationId}
             </if>
         </where>
     </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="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="status != null ">and cm_providers.status = #{status}</if>
-            <if test="userId != null ">and cm_providers.userId = #{userId}</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="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.manager.entity.caimei.providers.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>
 
     <select id="getProvidersUploadFileList" resultType="UploadFilePo">
@@ -173,17 +147,18 @@
             qrCodeImage as fileUrl,
         </if>
         name as fileName
-        from cm_providers AS cm_providers
+        from serviceprovider AS sp
         <where>
-            cm_providers.id in
+            sp.serviceProviderId in
             <foreach item="idsIn"
                      collection="ids.split(',')"
                      open="(" separator="," close=")">
                 #{idsIn}
             </foreach>
         </where>
-        group by cm_providers.id
+        group by sp.serviceProviderId
     </select>
+
     <select id="getProductList" resultType="com.caimei365.manager.entity.caimei.product.Product">
         SELECT
         p.productId,
@@ -211,6 +186,7 @@
             </if>
         </where>
     </select>
+
     <select id="getProviderProductList" resultType="com.caimei365.manager.entity.caimei.product.Product">
         SELECT
         p.productId,
@@ -237,12 +213,12 @@
     <select id="getProviderTeam" resultType="com.caimei365.manager.entity.caimei.providers.CmProviderTeam">
         SELECT DISTINCT csr.leaderId,
                         csr.createdTime,
-                        s.linkMan                                                              as leaderName,
+                        s.name                                                              as leaderName,
                         csr.id                                                                 as teamId,
                         csr.name,
                         (SELECT COUNT(teamId) FROM cm_serviceteam_group WHERE teamId = csr.id) AS groupCount
         FROM cm_serviceteam_role csr
-                 LEFT JOIN serviceprovider s ON csr.leaderId = s.serviceProviderID
+        LEFT JOIN serviceprovider s ON csr.leaderId = s.serviceProviderID
         order by csr.createdTime desc
     </select>
 
@@ -260,7 +236,6 @@
         a.townID AS "townId",
         a.flag AS "flag",
         a.spID AS "spId",
-        a.mainServiceProviderID AS "mainServiceProviderId",
         a.address AS "address",
         a.linkMan AS "linkMan",
         a.linkManIdentity AS "linkManIdentity",
@@ -356,8 +331,11 @@
         ORDER BY case when a.status = 91 then 0 else 1 end desc, a.addTime DESC
     </select>
 
-    <select id="groupList" resultType="com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel">
-        SELECT csg.serviceId AS serviceProviderId, s.linkMan as name, s.contractMobile as mobile,csr.leaderId as leaderId
+    <select id="groupList" resultType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
+        SELECT csg.serviceId    AS serviceProviderId,
+               s.name        as name,
+               s.contractMobile as mobile,
+               csr.leaderId     as leaderId
         FROM cm_serviceTeam_group csg
         LEFT JOIN serviceprovider s ON csg.serviceId = s.serviceProviderID
         LEFT JOIN cm_serviceteam_role csr ON csg.teamId = csr.id
@@ -365,30 +343,30 @@
     </select>
 
 
-    <insert id="addCmProviders" parameterType="CmProviders" useGeneratedKeys="true" keyProperty="id">
-        insert into cm_providers
+    <insert id="addCmProviders" parameterType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into serviceprovider
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">id,</if>
+            <if test="serviceProviderId != null and serviceProviderId != ''">id,</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="mobile != null and mobile != ''">contractMobile,</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>
+            <if test="addTime != null">addTime,</if>
             <if test="status != null">status,</if>
             <if test="userId != null">userId,</if>
             <if test="brandName != null and brandName != ''">brandName,</if>
             <if test="splitCode != null and splitCode != ''">splitCode,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id},</if>
+            <if test="serviceProviderId != null and serviceProviderId != ''">#{serviceProviderId},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="serviceLevel != null">#{serviceLevel},</if>
             <if test="serviceCategory != null">#{serviceCategory},</if>
@@ -400,8 +378,7 @@
             <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>
+            <if test="addTime != null">#{addTime},</if>
             <if test="status != null">#{status},</if>
             <if test="userId != null">#{userId},</if>
             <if test="brandName != null and brandName != ''">#{brandName},</if>
@@ -430,7 +407,7 @@
         </foreach>
     </insert>
 
-    <select id="addGroups" resultType="com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel">
+    <select id="addGroups" resultType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
         SELECT s.serviceProviderID AS serviceProviderId, s.linkMan as name, s.contractMobile as mobile
         FROM serviceprovider s
         LEFT JOIN cm_serviceTeam_group csg ON csg.serviceId = s.serviceProviderID
@@ -443,8 +420,8 @@
         </if>
     </select>
 
-    <update id="updateCmProviders" parameterType="CmProviders">
-        update cm_providers
+    <update id="updateCmProviders" parameterType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
+        update serviceprovider
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="serviceLevel != null">serviceLevel = #{serviceLevel},</if>
@@ -459,14 +436,13 @@
             </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>
+            <if test="addTime != null">addTime = #{addTime},</if>
             <if test="status != null">status = #{status},</if>
             <if test="userId != null">userId = #{userId},</if>
             <if test="brandName != null and brandName != ''">brandName = #{brandName},</if>
             <if test="splitCode != null and splitCode != ''">splitCode = #{splitCode},</if>
         </trim>
-        where id = #{id}
+        where serviceProviderID = #{serviceProviderId}
         <if test="userId != null">or userId = #{userId}</if>
     </update>
 
@@ -490,32 +466,8 @@
 
     <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="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="status != null ">and cm_providers.status = #{status}</if>
-            <if test="userId != null ">and cm_providers.userId = #{userId}</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="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>
+        from serviceprovider
+        where serviceProviderID = #{serviceProviderId}
     </delete>
 
     <delete id="delProviderProduct">

src/main/resources/mapper/user/CmClubRemarksDao.xml

@@ -2,18 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.manager.dao.user.CmClubRemarksDao">
 
-    <select id="getServiceList" resultType="com.caimei365.manager.entity.caimei.cmUser.ServiceProviderModel">
+    <select id="getServiceList" resultType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
         SELECT
             ser.serviceProviderID AS serviceProviderId,
             ser.linkMan,
             ser.userID AS userId,
-            ser.mainServiceProviderID AS mainServiceProviderId,
+            csr.leaderId AS leaderId,
             svs.linkMan as mainName
         FROM serviceprovider ser
-                 LEFT JOIN cm_serviceteam_group csg ON csg.serviceId = ser.serviceProviderID
-                 LEFT JOIN cm_serviceteam_role csr ON csr.id = csg.teamId
-                 LEFT JOIN (SELECT serviceProviderID, linkMan FROM serviceprovider WHERE validFlag = 1 AND STATUS = 90) svs ON svs.serviceProviderID = csr.leaderId
-        WHERE ser.organizeId = 0 AND ser.validFlag = 1 AND ser.status = 90 and ser.serviceProviderID not in(1371, 1342) GROUP BY ser.serviceProviderID
+        LEFT JOIN cm_serviceteam_group csg ON csg.serviceId = ser.serviceProviderID
+        LEFT JOIN cm_serviceteam_role csr ON csr.id = csg.teamId
+        LEFT JOIN (SELECT serviceProviderID, linkMan FROM serviceprovider WHERE STATUS = 90) svs ON svs.serviceProviderID = csr.leaderId
+        WHERE ser.organizeId = 0
+          AND ser.status = 90
+          and ser.serviceProviderID not in(1371, 1342)
+        GROUP BY ser.serviceProviderID
         order by csr.createdTime, ser.addTime asc
     </select>
 
@@ -90,7 +93,7 @@
         LEFT JOIN product p ON p.productID = ccr.productID
         LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>
-            s.validFlag = 1 and s.serviceProviderID not in (1371, 1342)
+            s.serviceProviderID not in (1371, 1342)
             <if test="clubId != null">
                 AND ccr.clubId = #{clubId}
             </if>
@@ -421,7 +424,7 @@
         LEFT JOIN product p ON p.productID = ccr.productID
         LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>
-            s.validFlag = 1 and s.serviceProviderID not in (1371, 1359, 1342)
+            s.serviceProviderID not in (1371, 1359, 1342)
             <if test="questionManId != null and questionManId != ''">
                 AND ccr.clubId is null
             </if>