报备

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -240,15 +240,14 @@ public class CommConstant {
     public static final Integer CUSTOMER_PREPARATORY = 3;
 
     /**
-     * 客户认购
+     * 客户签约
      */
-    public static final Integer CUSTOMER_PREORDER = 4;
+    public static final Integer CUSTOMER_SIGNED = 4;
 
     /**
-     * 客户签约
+     * 客户结佣
      */
-    public static final Integer CUSTOMER_SIGNED = 5;
-
+    public static final Integer CUSTOMER_COMMISSION = 5;
 
     /**
      * 待审核

src/main/java/com/yunzhi/marketing/dto/StatisticsDTO.java

@@ -0,0 +1,21 @@
+package com.yunzhi.marketing.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class StatisticsDTO {
+
+    private String buildingId;
+
+    private LocalDateTime startDate;
+
+    private LocalDateTime endDate;
+
+    private Integer orgId;
+
+    private String personId;
+
+    private String channelId;
+}

src/main/java/com/yunzhi/marketing/po/CustomerRankListVO.java

@@ -0,0 +1,7 @@
+package com.yunzhi.marketing.po;
+
+import lombok.Data;
+
+@Data
+public class CustomerRankListVO {
+}

src/main/java/com/yunzhi/marketing/po/TaRecommendCustomerPO.java

@@ -23,6 +23,12 @@ public class TaRecommendCustomerPO {
 
     private LocalDateTime createDate;
 
+    private String customerStatus;
+
+    private String consultant;
+
+    private String avatarurl;
+
     /**
      * 过了保护期的时间
      */

src/main/java/com/yunzhi/marketing/po/TaRecommendCustomerVO.java

@@ -11,7 +11,6 @@ import com.yunzhi.marketing.entity.PersonIntention;
 import com.yunzhi.marketing.entity.TaPersonVisitRecord;
 import com.yunzhi.marketing.xlk.entity.CustomerPreparatory;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
-import com.yunzhi.marketing.xlk.entity.CustomerSubscribe;
 import com.yunzhi.marketing.xlk.entity.CustomerVisit;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -243,11 +242,6 @@ public class TaRecommendCustomerVO implements Serializable {
      */
     private CustomerVisit customerVisit;
 
-    /**
-     * 认购
-     */
-    private CustomerSubscribe customerSubscribe;
-
     /**
      * 签约
      */

src/main/java/com/yunzhi/marketing/service/ChannelCustomerStatisticsService.java

@@ -0,0 +1,8 @@
+package com.yunzhi.marketing.service;
+
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.dto.StatisticsDTO;
+
+public interface ChannelCustomerStatisticsService {
+    ResponseBean getRanklist(StatisticsDTO statisticsDTo);
+}

src/main/java/com/yunzhi/marketing/service/impl/ChannelCustomerStatisticsServiceImpl.java

@@ -0,0 +1,39 @@
+package com.yunzhi.marketing.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.dto.StatisticsDTO;
+import com.yunzhi.marketing.po.CustomerRankListVO;
+import com.yunzhi.marketing.service.ChannelCustomerStatisticsService;
+import com.yunzhi.marketing.xlk.entity.BuildingChannel;
+import com.yunzhi.marketing.xlk.mapper.BuildingChannelMapper;
+import com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper;
+import org.ietf.jgss.ChannelBinding;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ChannelCustomerStatisticsServiceImpl implements ChannelCustomerStatisticsService {
+
+    @Autowired
+    private BuildingChannelMapper buildingChannelMapper;
+
+    @Autowired
+    private ChannelCustomerMapper channelCustomerMapper;
+
+    @Override
+    public ResponseBean getRanklist(StatisticsDTO statisticsDTo) {
+        LambdaQueryWrapper<BuildingChannel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(BuildingChannel::getBuildingId,statisticsDTo.getBuildingId());
+        BuildingChannel buildingChannel = buildingChannelMapper.selectOne(lambdaQueryWrapper);
+
+        if (null == buildingChannel) {
+            return ResponseBean.error("此楼盘未绑定渠道商", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        statisticsDTo.setChannelId(buildingChannel.getChannelId());
+        List<CustomerRankListVO> list = channelCustomerMapper.getRanklist(statisticsDTo);
+        return ResponseBean.success(list);
+    }
+}

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -137,9 +137,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private CustomerSignatoryMapper customerSignatoryMapper;
 
-    @Autowired
-    private CustomerSubscribeMapper customerSubscribeMapper;
-
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -708,12 +705,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             lambdaQueryWrapper.eq(CustomerPreparatory::getCustomerId,taRecommendCustomer.getCustomerId());
             CustomerPreparatory customerPreparatory = customerPreparatoryMapper.selectOne(lambdaQueryWrapper);
             taRecommendCustomerVO.setCustomerPreparatory(customerPreparatory);
-        }else if (CommConstant.CUSTOMER_PREORDER.equals(taRecommendCustomer.getStatus())) {
-            // 认购状态
-            LambdaQueryWrapper<CustomerSubscribe> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(CustomerSubscribe::getCustomerId,taRecommendCustomer.getCustomerId());
-            CustomerSubscribe customerSubscribe = customerSubscribeMapper.selectOne(lambdaQueryWrapper);
-            taRecommendCustomerVO.setCustomerSubscribe(customerSubscribe);
         }else if (CommConstant.CUSTOMER_SIGNED.equals(taRecommendCustomer.getStatus())) {
             // 签约状态
             LambdaQueryWrapper<CustomerSignatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

@@ -123,9 +123,9 @@ public class ChannelCustomerController extends BaseController {
      * @return
      */
     @ApiOperation(value = "森哥看这里-wx-驻场确认认购", notes = "森哥看这里-wx-驻场确认认购")
-    @RequestMapping(value="/wx/marking/subscribe",method= RequestMethod.PUT)
-    public ResponseBean subscribeCustomer(@RequestBody MarkingSubscribeCustomerDTO params){
-        return iChannelCustomerService.subscribeCustomer(params);
+    @RequestMapping(value="/wx/marking/commission",method= RequestMethod.PUT)
+    public ResponseBean commissionCustomer(@RequestBody MarkingCommissionCustomerDTO params){
+        return iChannelCustomerService.commissionCustomer(params);
     }
 
     /**

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerStatisticsController.java

@@ -0,0 +1,55 @@
+package com.yunzhi.marketing.xlk.controller;
+
+
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.dto.StatisticsDTO;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.service.ChannelCustomerStatisticsService;
+import com.yunzhi.marketing.service.ITaPersonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+@Api(value = "森哥看这里-合作渠道统计表", tags = "森哥看这里-xlk-合作渠道统计表")
+public class ChannelCustomerStatisticsController extends BaseController {
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    private ChannelCustomerStatisticsService channelCustomerStatisticsService;
+
+    @ApiOperation(value = "wx-龙虎榜排名数据", notes = "wx-龙虎榜排名数据")
+    @GetMapping(value="/wx/ranklist")
+    public ResponseBean getRanklist(@RequestParam("buildingId") String buildingId,
+                                    @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+                                    @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate,
+                                    @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = persons.get(0);
+
+        // 构造参数
+        StatisticsDTO statisticsDTo = new StatisticsDTO();
+        statisticsDTo.setBuildingId(buildingId);
+        statisticsDTo.setStartDate(startDate);
+        statisticsDTo.setEndDate(endDate);
+        statisticsDTo.setPersonId(person.getPersonId());
+        return  channelCustomerStatisticsService.getRanklist(statisticsDTo);
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerSubscribeController.java

@@ -1,162 +0,0 @@
-package com.yunzhi.marketing.xlk.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.marketing.base.BaseController;
-import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.xlk.entity.CustomerSubscribe;
-import com.yunzhi.marketing.xlk.service.ICustomerSubscribeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
-    * 客户认购单  前端控制器
-    * </p>
- *
- * @author jobob
- * @since 2021-07-30
- */
-@RestController
-@RequestMapping("/api")
-@Api(value = "", tags = "xlk-")
-public class CustomerSubscribeController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(CustomerSubscribeController.class);
-
-    @Autowired
-    public ICustomerSubscribeService iCustomerSubscribeService;
-
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @ApiOperation(value = "", notes = "")
-    @RequestMapping(value="/customerSubscribe",method= RequestMethod.GET)
-    public ResponseBean customerSubscribeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                              @RequestHeader("authorization") String token, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-		    IPage<CustomerSubscribe> pg = new Page<>(pageNum, pageSize);
-            LambdaQueryWrapper<CustomerSubscribe> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(CustomerSubscribe::getOrgId,getOrgId(request));
-            queryWrapper.orderByDesc(CustomerSubscribe::getCreateDate);
-
-            IPage<CustomerSubscribe> result = iCustomerSubscribeService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("customerSubscribeList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 保存对象
-     * @param customerSubscribe 实体对象
-     * @return
-     */
-    @ApiOperation(value = "", notes = "")
-    @RequestMapping(value="/customerSubscribe",method= RequestMethod.POST)
-    public ResponseBean customerSubscribeAdd(@RequestBody CustomerSubscribe customerSubscribe, @RequestHeader("authorization") String token, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iCustomerSubscribeService.save(customerSubscribe)){
-                responseBean.addSuccess(customerSubscribe);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("customerSubscribeAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @ApiOperation(value = "", notes = "")
-    @ResponseBody
-    @RequestMapping(value="/customerSubscribe/{id}", method= RequestMethod.DELETE)
-    public ResponseBean customerSubscribeDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(iCustomerSubscribeService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("customerSubscribeDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param customerSubscribe 实体对象
-     * @return
-     */
-    @ApiOperation(value = "", notes = "")
-    @RequestMapping(value="/customerSubscribe/{id}",method= RequestMethod.PUT)
-    public ResponseBean customerSubscribeUpdate(@PathVariable String id,
-                                                @RequestBody CustomerSubscribe customerSubscribe, @RequestHeader("authorization") String token, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iCustomerSubscribeService.updateById(customerSubscribe)){
-                responseBean.addSuccess(customerSubscribe);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("customerSubscribeUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @ApiOperation(value = "", notes = "")
-    @RequestMapping(value="/customerSubscribe/{id}",method= RequestMethod.GET)
-    public ResponseBean customerSubscribeGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(iCustomerSubscribeService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("customerSubscribeDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-}

src/main/java/com/yunzhi/marketing/xlk/dto/MarkingCommissionCustomerDTO.java

@@ -0,0 +1,10 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import lombok.Data;
+
+@Data
+public class MarkingCommissionCustomerDTO {
+
+    private String customerId;
+
+}

src/main/java/com/yunzhi/marketing/xlk/dto/MarkingSubscribeCustomerDTO.java

@@ -1,30 +0,0 @@
-package com.yunzhi.marketing.xlk.dto;
-
-import com.yunzhi.marketing.xlk.entity.CustomerPreparatory;
-import com.yunzhi.marketing.xlk.entity.CustomerSubscribe;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 渠道报备客户表 
- * </p>
- *
- * @author jobob
- * @since 2021-07-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class MarkingSubscribeCustomerDTO implements Serializable {
-
-    private String customerId;
-
-    /**
-     * 认筹
-     */
-   private CustomerSubscribe customerSubscribe;
-}

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerSubscribe.java

@@ -1,118 +0,0 @@
-package com.yunzhi.marketing.xlk.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 客户认购单 
- * </p>
- *
- * @author jobob
- * @since 2021-07-30
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("xlk_customer_subscribe")
-public class CustomerSubscribe implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    private String customerSubscribeId;
-
-    /**
-     * 客户id
-     */
-    private String customerId;
-
-    /**
-     * 楼盘id
-     */
-    private String buildingId;
-
-    /**
-     * 客户姓名
-     */
-    private String name;
-
-    /**
-     * 推荐人（归属渠道）
-     */
-    private String recommendPerson;
-
-    /**
-     * 推荐人姓名（归属渠道）
-     */
-    private String recommendName;
-
-    /**
-     * 内场接待（置业顾问）
-     */
-    private String realtyConsultant;
-
-    /**
-     * 内场接待（置业顾问）姓名
-     */
-    private String realtyConsultantName;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createDate;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 公司id
-     */
-    private Integer orgId;
-
-    /**
-     * 业绩分成人
-     */
-    private String dividendsName;
-
-    /**
-     * 比例
-     */
-    private String proportion;
-
-    /**
-     * 户型
-     */
-    private String houseType;
-
-    /**
-     * 栋
-     */
-    private String ridgepole;
-
-    /**
-     * 单元
-     */
-    private String unit;
-
-    /**
-     * 室
-     */
-    private String room;
-
-    /**
-     * 金额
-     */
-    private String price;
-
-
-}

src/main/java/com/yunzhi/marketing/xlk/mapper/CustomerSubscribeMapper.java

@@ -1,18 +0,0 @@
-package com.yunzhi.marketing.xlk.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yunzhi.marketing.xlk.entity.CustomerSubscribe;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 客户认购单  Mapper 接口
- * </p>
- *
- * @author jobob
- * @since 2021-07-30
- */
-@Mapper
-public interface CustomerSubscribeMapper extends BaseMapper<CustomerSubscribe> {
-
-}

src/main/java/com/yunzhi/marketing/xlk/service/IChannelCustomerService.java

@@ -61,7 +61,7 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @param params
      * @return
      */
-    ResponseBean subscribeCustomer(MarkingSubscribeCustomerDTO params);
+    ResponseBean commissionCustomer(MarkingCommissionCustomerDTO params);
 
     /**
      * 驻场签约

src/main/java/com/yunzhi/marketing/xlk/service/ICustomerSubscribeService.java

@@ -1,16 +0,0 @@
-package com.yunzhi.marketing.xlk.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yunzhi.marketing.xlk.entity.CustomerSubscribe;
-
-/**
- * <p>
- * 客户认购单  服务类
- * </p>
- *
- * @author jobob
- * @since 2021-07-30
- */
-public interface ICustomerSubscribeService extends IService<CustomerSubscribe> {
-
-}

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -42,10 +42,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
     @Autowired
     private CustomerSignatoryMapper customerSignatoryMapper;
-
-    @Autowired
-    private CustomerSubscribeMapper customerSubscribeMapper;
-
     /**
      * 审核
      *
@@ -245,20 +241,16 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
     }
 
     /**
-     * 驻场认购
+     * 驻场结佣金
      *
      * @param params
      * @return
      */
     @Override
-    public ResponseBean subscribeCustomer(MarkingSubscribeCustomerDTO params) {
+    public ResponseBean commissionCustomer(MarkingCommissionCustomerDTO params) {
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getCustomerId());
-        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_PREORDER);
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_COMMISSION);
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
-
-        CustomerSubscribe customerSubscribe = params.getCustomerSubscribe();
-        customerSubscribe.setCreateDate(LocalDateTime.now());
-        customerSubscribeMapper.insert(customerSubscribe);
         return ResponseBean.success("审核成功");
     }
 

src/main/java/com/yunzhi/marketing/xlk/service/impl/CustomerSubscribeServiceImpl.java

@@ -1,20 +0,0 @@
-package com.yunzhi.marketing.xlk.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yunzhi.marketing.xlk.entity.CustomerSubscribe;
-import com.yunzhi.marketing.xlk.mapper.CustomerSubscribeMapper;
-import com.yunzhi.marketing.xlk.service.ICustomerSubscribeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 客户认购单  服务实现类
- * </p>
- *
- * @author jobob
- * @since 2021-07-30
- */
-@Service
-public class CustomerSubscribeServiceImpl extends ServiceImpl<CustomerSubscribeMapper, CustomerSubscribe> implements ICustomerSubscribeService {
-
-}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -891,7 +891,6 @@ FROM
                 #{personBuilding.buildingId}
             </foreach>
         </if>
-        ORDER BY create_date
         union all
         SELECT
         a.channel_customer_id AS id,

src/main/resources/mapper/xlk/CustomerSubscribeMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunzhi.marketing.xlk.mapper.CustomerSubscribeMapper">
-
-</mapper>