feats

src/main/java/com/yunzhi/marketing/entity/TaBuilding.java

@@ -77,6 +77,12 @@ public class TaBuilding implements Serializable {
      */
     private String dynamic;
 
+    /**
+     * 有效期
+     */
+    private Integer expirationDate;
+
+
     /**
      * 电话
      */

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

@@ -0,0 +1,21 @@
+package com.yunzhi.marketing.po;
+
+import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class MineRecommendCustomerPO extends ChannelCustomer {
+
+    private String avatarurl;
+
+    private String type;
+
+    private String customerStatus;
+
+    /**
+     * 过了保护期的时间
+     */
+    private Integer expirationDate;
+}

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

@@ -3,7 +3,9 @@ package com.yunzhi.marketing.xlk.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.xlk.dto.BuildingChannelDTO;
 import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
@@ -44,6 +46,9 @@ public class BuildingChannelController extends BaseController {
     @Autowired
     ITaPersonService iTaPersonService;
 
+    @Autowired
+    private ITaBuildingService taBuildingService;
+
     /**
      * 保存对象
      * @param buildingChannelDTO 实体对象
@@ -113,6 +118,11 @@ public class BuildingChannelController extends BaseController {
             buildingChannelList.add(buildingChannel);
         });
 
+        // 楼盘中冗余一份
+        TaBuilding building = taBuildingService.getById(buildingChannelDTO.getBuildingId());
+        building.setExpirationDate(buildingChannelDTO.getExpirationDate());
+        taBuildingService.updateById(building);
+
         return iBuildingChannelService.saveBatch(buildingChannelList);
     }
 

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

@@ -6,6 +6,8 @@ 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.entity.TaPerson;
+import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.xlk.dto.*;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
@@ -14,9 +16,11 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.LocalDateTime;
 
 /**
  * <p>
@@ -36,6 +40,9 @@ public class ChannelCustomerController extends BaseController {
     @Autowired
     public IChannelCustomerService iChannelCustomerService;
 
+    @Autowired
+    private ITaPersonService taPersonService;
+
 
     /**
      * 分页查询列表
@@ -170,20 +177,48 @@ public class ChannelCustomerController extends BaseController {
         return responseBean;
     }
 
+
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/channelCustomer/{id}",method= RequestMethod.GET)
-    public ResponseBean wxGetCust(@PathVariable String id){
+    public ResponseBean wxGetCust(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iChannelCustomerService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("channelCustomerDelete -=- {}",e.toString());
+            logger.error("channelCustomerDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
+
+
+    @ApiOperation(value = "森哥看这里-wx-查询经纪人的我的客户列表", notes = "森哥看这里-wx-查询经纪人的我的客户列表")
+    @GetMapping("/wx/channelCustomer/recommend/mine")
+    public ResponseBean getWxCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize,
+                                                   @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,
+                                                   @RequestParam(value = "status", required = false) Integer status,
+                                                   @RequestParam(value = "name", required = false) String name,
+                                                   HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        String personId = getPersonId(request);
+        TaPerson person = taPersonService.getById(personId);
+        try {
+            RecommendCustomerDTO recommendCustomerDTO = new RecommendCustomerDTO();
+            recommendCustomerDTO.setEndDate(endDate);
+            recommendCustomerDTO.setStartDate(startDate);
+            recommendCustomerDTO.setOrgId(orgId);
+            recommendCustomerDTO.setPersonId(personId);
+            recommendCustomerDTO.setStatus(status);
+            recommendCustomerDTO.setName(name);
+            return iChannelCustomerService.getCustomersIRecommended(pageNumber, pageSize, recommendCustomerDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 }

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

@@ -49,6 +49,7 @@ public class ChannelCustomerStatisticsController extends BaseController {
         statisticsDTo.setBuildingId(buildingId);
         statisticsDTo.setStartDate(startDate);
         statisticsDTo.setEndDate(endDate);
+        statisticsDTo.setOrgId(orgId);
         statisticsDTo.setPersonId(person.getPersonId());
         return  channelCustomerStatisticsService.getRanklist(statisticsDTo);
     }

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

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

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

@@ -34,11 +34,27 @@ public class ChannelCustomer implements Serializable {
     @TableId(value = "channel_customer_id", type = IdType.UUID)
     private String channelCustomerId;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
     /**
      * 创建时间
      */
     private LocalDateTime createDate;
 
+    /**
+     * 到访时间
+     */
+    private LocalDateTime visitDate ;
+    /** 认筹时间 */
+    private LocalDateTime preparatoryDate ;
+    /** 签约时间 */
+    private LocalDateTime signedDate ;
+    /** 结佣时间 */
+    private LocalDateTime commissionDate ;
+
     /**
      * 公司id
      */
@@ -96,6 +112,16 @@ public class ChannelCustomer implements Serializable {
      */
     private Integer channelId;
 
+    /**
+     * 置业顾问
+     */
+    private String realtyConsultant;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 推荐人姓名
      */

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.dto.StatisticsDTO;
 import com.yunzhi.marketing.po.CustomerRankListVO;
+import com.yunzhi.marketing.po.MineRecommendCustomerPO;
+import com.yunzhi.marketing.po.TaRecommendCustomerPO;
+import com.yunzhi.marketing.xlk.dto.RecommendCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -31,4 +34,6 @@ public interface ChannelCustomerMapper extends BaseMapper<ChannelCustomer> {
                                           @Param("status") String status,@Param("type") String type);
 
     List<CustomerRankListVO> getRanklist(@Param("params") StatisticsDTO statisticsDTo);
+
+    IPage<MineRecommendCustomerPO>  getCustomersIRecommended(IPage<MineRecommendCustomerPO> page,@Param("params") RecommendCustomerDTO recommendCustomerDTO);
 }

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

@@ -69,4 +69,13 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @return
      */
     ResponseBean signatoryCustomer(MarkingSignatoryCustomerDTO params);
+
+    /**
+     * 查询经纪人的我的客户列表
+     * @param pageNumber
+     * @param pageSize
+     * @param recommendCustomerDTO
+     * @return
+     */
+    ResponseBean getCustomersIRecommended(int pageNumber, int pageSize, RecommendCustomerDTO recommendCustomerDTO);
 }

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

@@ -2,12 +2,15 @@ package com.yunzhi.marketing.xlk.service.impl;
 
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
 import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
+import com.yunzhi.marketing.po.MineRecommendCustomerPO;
+import com.yunzhi.marketing.po.TaRecommendCustomerPO;
 import com.yunzhi.marketing.xlk.dto.*;
 import com.yunzhi.marketing.xlk.entity.*;
 import com.yunzhi.marketing.xlk.mapper.*;
@@ -65,9 +68,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
         TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
         if (null == recommendCustomer) {
-            // 审核通过
-            customer.setStatus("2");
-            channelCustomerMapper.updateById(customer);
             // 进业务客户表
             TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
             taRecommendCustomer.setName(customer.getName());
@@ -87,6 +87,11 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             taRecommendCustomer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
             taRecommendCustomer.setCirculationTime(LocalDateTime.now());
             taRecommendCustomerMapper.insert(taRecommendCustomer);
+            // 审核通过
+            customer.setStatus("2");
+            customer.setCustomerId(taRecommendCustomer.getCustomerId());
+            customer.setVisitDate(LocalDateTime.now());
+            channelCustomerMapper.updateById(customer);
             return ResponseBean.success("审核成功");
         }
 
@@ -94,6 +99,8 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
             // 审核通过
             customer.setStatus("2");
+            customer.setCustomerId(recommendCustomer.getCustomerId());
+            customer.setVisitDate(LocalDateTime.now());
             channelCustomerMapper.updateById(customer);
             return ResponseBean.success("审核成功");
         }
@@ -119,9 +126,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
             TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
             if (null == recommendCustomer) {
-                // 审核通过
-                customer.setStatus("2");
-                channelCustomerMapper.updateById(customer);
                 // 进业务客户表
                 TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
                 taRecommendCustomer.setName(customer.getName());
@@ -141,10 +145,18 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 taRecommendCustomer.setRealtyConsultant(params.getRealtyConsultant());
                 taRecommendCustomer.setCirculationTime(LocalDateTime.now());
                 taRecommendCustomerMapper.insert(taRecommendCustomer);
+
+                // 审核通过
+                customer.setStatus("2");
+                customer.setVisitDate(LocalDateTime.now());
+                customer.setCustomerId(taRecommendCustomer.getCustomerId());
+                channelCustomerMapper.updateById(customer);
             }else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
                     (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
                 // 审核通过
                 customer.setStatus("2");
+                customer.setVisitDate(LocalDateTime.now());
+                customer.setCustomerId(recommendCustomer.getCustomerId());
                 channelCustomerMapper.updateById(customer);
 
                 // 修改状态为确认到访状态
@@ -234,6 +246,11 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_PREPARATORY);
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
 
+        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
+        ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
+        customer.setPreparatoryDate(LocalDateTime.now());
+
         CustomerPreparatory customerPreparatory = params.getCustomerPreparatory();
         customerPreparatory.setCreateDate(LocalDateTime.now());
         customerPreparatoryMapper.insert(customerPreparatory);
@@ -251,6 +268,12 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getCustomerId());
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_COMMISSION);
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
+
+        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
+        ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
+        customer.setCommissionDate(LocalDateTime.now());
+
         return ResponseBean.success("审核成功");
     }
 
@@ -266,9 +289,29 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_SIGNED);
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
 
+        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
+        ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
+        customer.setSignedDate(LocalDateTime.now());
+
         CustomerSignatory customerSignatory = params.getCustomerSignatory();
         customerSignatory.setCreateDate(LocalDateTime.now());
         customerSignatoryMapper.insert(customerSignatory);
         return ResponseBean.success("审核成功");
     }
+
+    /**
+     * 查询经纪人的我的客户列表
+     *
+     * @param pageNumber
+     * @param pageSize
+     * @param recommendCustomerDTO
+     * @return
+     */
+    @Override
+    public ResponseBean getCustomersIRecommended(int pageNumber, int pageSize, RecommendCustomerDTO recommendCustomerDTO) {
+        IPage<MineRecommendCustomerPO> page = new Page<MineRecommendCustomerPO>(pageNumber, pageSize);
+        IPage<MineRecommendCustomerPO> customersIRecommended = channelCustomerMapper.getCustomersIRecommended(page, recommendCustomerDTO);
+        return ResponseBean.success(customersIRecommended);
+    }
 }

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

@@ -53,7 +53,7 @@
             xlk_channel_customer t
         LEFT JOIN ta_person p on t.recommend_person = p.person_id
         WHERE t.channel_id  = #{params.channelId}
-        and `status` = 2
+        and `status` != 3
         <if test="params.startDate != null or params.endDate != null">
             AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}
         </if>
@@ -64,4 +64,36 @@
         ORDER BY number desc
         LIMIT 3
     </select>
+
+    <select id="getCustomersIRecommended" resultType="com.yunzhi.marketing.po.MineRecommendCustomerPO">
+        SELECT
+            a.*,
+            b.avatarurl ,
+            ifnull(c.`status`, 1) as customer_status,
+            if(c.customer_id is null, "report", "customer") as type,
+            d.expiration_date
+        FROM
+            xlk_channel_customer a
+        LEFT JOIN ta_person b ON a.person_id = b.person_id
+        left join ta_recommend_customer c on a.customer_id = c.customer_id
+        LEFT JOIN ta_building d on a.building_id = d.building_id
+        WHERE
+        a.recommend_person = #{params.personId}
+        and a.`status` != 3
+        and a.org_id = #{params.orgId}
+        <if test="params.status != null and params.status !=''">
+            and c.status = #{params.status}
+        </if>
+        <if test="params.name != null and params.name !=''">
+            and a.name like CONCAT('%',#{params.name}, '%')
+        </if>
+        <if test="params.startDate != null and params.startDate != null">
+            AND a.create_date >= #{params.startDate}
+        </if>
+        <if test="params.endDate != null and params.endDate != null">
+            AND (a.visit_date &lt;= #{params.endDate} or a.preparatory_date &lt;= #{params.endDate} or a.signed_date &lt;= #{params.endDate} or a.commission_date &lt;= #{params.endDate})
+        </if>
+        ORDER BY
+        a.create_date desc
+    </select>
 </mapper>