服务商任务bugfix

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

@@ -2,7 +2,6 @@ package com.caimei365.user.controller;
 
 import com.caimei365.user.model.ResponseJson;
 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;
 import com.github.pagehelper.PageHelper;
@@ -34,10 +33,9 @@ public class ProvidersController {
     @GetMapping("/from")
     public ResponseJson getProvidersFrom(Integer serviceProviderId, String providersName,
                                          @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                         @RequestParam(value = "pageSize", defaultValue = "20") int pageSize
-    ) {
+                                         @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<ServiceProviderModel> cmProviders = cmProvidersService.getByCmProviders(new ServiceProviderModel().setServiceProviderId(serviceProviderId).setName(providersName).setStatus(90));
-        return ResponseJson.success(new PageInfo<>(BeanUtil.setValues(cmProviders, CmProvidersVO.class)));
+        return ResponseJson.success(new PageInfo<>(BeanUtil.setValues(cmProviders, ServiceProviderModel.class)));
     }
 }

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

@@ -27,8 +27,8 @@ public class CmRelatedImage implements Serializable {
 
     /**
      * 分类：1分销报备凭证图片(cm_reporting_member)
-     * ,2 (cm_providers)服务商相关简介图
-     * ,3 (cm_providers)服务商相关资料文件
+     * ,2 (serviceprovider)服务商相关简介图
+     * ,3 (serviceprovider)服务商相关资料文件
      * ,4 (cm_providers_contract)服务商相关合同文件
      */
     private String type;

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

@@ -1,84 +0,0 @@
-package com.caimei365.user.model.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 对象 cm_providers VO对象
- *
- * @author Kaick
- * @date 2023-12-14
- */
-@Accessors(chain = true)
-@Data
-public class CmProvidersVO implements Serializable {
-    private static final long serialVersionUID = 1L;
-    /**
-     * id
-     */
-    private String serviceProviderId;
-
-    /**
-     * 用户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;
-
-    /**
-     * 简介
-     */
-    private String text;
-
-    /**
-     * 服务商二维码
-     */
-    private String qrCodeImage;
-
-    /**
-     * 资格证书图片
-     */
-    private String qualificationImage;
-
-    /**
-     * 资格证书编号
-     */
-    private String qualificationId;
-
-    /**
-     * 相关简介图集合
-     */
-    private List<String> textRelateds;
-
-}

src/main/resources/mapper/SellerMapper.xml

@@ -454,7 +454,6 @@
                s.contractMobile,
                s.linkMan,
                s.duty,
-               s.contractEmail,
                s.addTime,
                s.qrCode,
                u.image
@@ -807,6 +806,7 @@
                  LEFT JOIN provider_task_click ptc ON cpt.id = ptc.taskId
                  left join product p on cpt.productId = p.productId
         where cpt.shopId = #{shopId}
+        GROUP BY cpt.id
     </select>
 
     <resultMap id="providerTasks" type="com.caimei365.user.model.vo.ProviderTaskVo">