Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/controller/TaRecommendCustomerController.java

@@ -202,7 +202,7 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @PostMapping("/wx/channel/report")
-    public ResponseBean channelReportCust(@RequestBody ChannelReportDTO channelReportDTO, HttpServletRequest request) {
+    public ResponseBean channelReportCust(@RequestBody ChannelReportDTO channelReportDTO, HttpServletRequest request) throws Exception {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         channelReportDTO.setOpenid(openid);

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

@@ -195,5 +195,5 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param channelReportDTO
      * @return
      */
-    ResponseBean channelReportCust(ChannelReportDTO channelReportDTO);
+    ResponseBean channelReportCust(ChannelReportDTO channelReportDTO) throws Exception;
 }

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

@@ -26,7 +26,9 @@ import com.yunzhi.marketing.statistic.entity.TaCustomerFollowUpRecord;
 import com.yunzhi.marketing.statistic.mapper.TaCustomerFollowUpRecordMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.mapper.*;
+import com.yunzhi.marketing.xlk.entity.BuildingChannel;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
+import com.yunzhi.marketing.xlk.mapper.BuildingChannelMapper;
 import com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
@@ -118,6 +120,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private ChannelCustomerMapper channelCustomerMapper;
 
+    @Autowired
+    private BuildingChannelMapper buildingChannelMapper;
+
+    @Autowired
+    private TaChannelPersonMapper channelPersonMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -351,7 +359,15 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
      * @return
      */
     @Override
-    public ResponseBean channelReportCust(ChannelReportDTO channelReportDTO) {
+    public ResponseBean channelReportCust(ChannelReportDTO channelReportDTO) throws Exception {
+
+        // 当前人员
+        List<TaPerson> persons = getPersonsByOpenId(channelReportDTO.getOpenid());
+        if (null == persons || persons.size() != 1) {
+            throw new Exception("当前人员 openid 异常");
+        }
+        TaPerson person = persons.get(0);
+
         // 先查看在ta_recommend_customer 手机号是否存在
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaRecommendCustomer::getPhone,channelReportDTO.getPhone());
@@ -360,6 +376,40 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (taRecommendCustomers.size() > 0) {
             return ResponseBean.error("已存在的客户报备失败", ResponseBean.ERROR_UNAVAILABLE);
         }
+        //查询此楼盘的渠道id
+        LambdaQueryWrapper<TaChannelPerson> channelPersonLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        channelPersonLambdaQueryWrapper.eq(TaChannelPerson::getPersonId,person.getPersonId());
+        TaChannelPerson taChannelPeople = channelPersonMapper.selectOne(channelPersonLambdaQueryWrapper);
+        if (null == taChannelPeople) {
+            return ResponseBean.error("不是渠道用户请绑定", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 查询这个楼盘的这个渠道的有效保护期
+        LambdaQueryWrapper<BuildingChannel> buildingChannelLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        buildingChannelLambdaQueryWrapper.eq(BuildingChannel::getBuildingId,channelReportDTO.getBuildingId());
+        buildingChannelLambdaQueryWrapper.eq(BuildingChannel::getChannelId,taChannelPeople.getChannelId());
+        BuildingChannel buildingChannel = buildingChannelMapper.selectOne(buildingChannelLambdaQueryWrapper);
+
+        // 查询是否在渠道推荐表中
+        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getBuildingId,channelReportDTO.getBuildingId());
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getChannelId,taChannelPeople.getChannelId());
+        channelCustomerLambdaQueryWrapper.ne(ChannelCustomer::getStatus,"3");
+        List<ChannelCustomer> channelCustomers = channelCustomerMapper.selectList(channelCustomerLambdaQueryWrapper);
+        List<ChannelCustomer> passCustomer = channelCustomers.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.toList());
+        if (passCustomer.size() > 0) {
+            return ResponseBean.error("此用户已经被报备", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 审核中的
+        for (ChannelCustomer customer : channelCustomers) {
+            // 过期时间
+            LocalDateTime expirDate = customer.getCreateDate().plusDays(buildingChannel.getExpirationDate());
+            LocalDateTime now = LocalDateTime.now();
+            if (now.isBefore(expirDate)) {
+                return ResponseBean.error("此用户已经被报备", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
 
         // 入渠道推荐客户表
         ChannelCustomer channelCustomer = new ChannelCustomer();
@@ -370,10 +420,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         channelCustomer.setSex(channelReportDTO.getSex());
         channelCustomer.setRecommendPerson(channelReportDTO.getRealtyChannel());
         channelCustomer.setCreateDate(LocalDateTime.now());
-        channelCustomer.setStatus("0");
+        channelCustomer.setStatus("1");
+        channelCustomer.setChannelId(taChannelPeople.getChannelId());
         channelCustomer.setOrgId(channelReportDTO.getOrgId());
         channelCustomerMapper.insert(channelCustomer);
-        return null;
+        return ResponseBean.success(channelCustomer);
     }
 
     private void fillSomeFieldsOfCustomer(TaRecommendCustomer customer, TaPerson recommender, LocalDateTime now) {

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

@@ -1,12 +1,16 @@
 package com.yunzhi.marketing.xlk.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.dto.ChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
+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;
@@ -21,7 +25,8 @@ import org.springframework.web.bind.annotation.*;
  * @since 2021-07-19
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
+@Api(value = "渠道报备客户表", tags = "xlk-渠道报备客户表")
 public class ChannelCustomerController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(ChannelCustomerController.class);
@@ -36,15 +41,17 @@ public class ChannelCustomerController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/channelCustomer",method= RequestMethod.GET)
+    @ApiOperation(value = "admin-渠道报备客户表", notes = "admin-渠道报备客户表")
+    @RequestMapping(value="/admin/channelCustomer",method= RequestMethod.GET)
     public ResponseBean channelCustomerList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<ChannelCustomer> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<ChannelCustomer> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            LambdaQueryWrapper<ChannelCustomer> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(ChannelCustomer::getStatus,"1");
+            queryWrapper.orderByDesc(ChannelCustomer::getCreateDate);
 
             IPage<ChannelCustomer> result = iChannelCustomerService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -57,78 +64,23 @@ public class ChannelCustomerController extends BaseController {
     }
 
     /**
-     * 保存对象
-     * @param channelCustomer 实体对象
-     * @return
-     */
-    @RequestMapping(value="/channelCustomer",method= RequestMethod.POST)
-    public ResponseBean channelCustomerAdd(@RequestBody ChannelCustomer channelCustomer){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iChannelCustomerService.save(channelCustomer)){
-                responseBean.addSuccess(channelCustomer);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("channelCustomerAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @ResponseBody
-    @RequestMapping(value="/channelCustomer/{id}", method= RequestMethod.DELETE)
-    public ResponseBean channelCustomerDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(iChannelCustomerService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("channelCustomerDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 修改对象
+     * 审核
      * @param id  实体ID
-     * @param channelCustomer 实体对象
+     * @param channelCustomerDTO 实体对象
      * @return
      */
-    @RequestMapping(value="/channelCustomer/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value = "admin-渠道报备客户审核", notes = "admin-渠道报备客户审核")
+    @RequestMapping(value="/admin/channelCustomer/{id}",method= RequestMethod.PUT)
     public ResponseBean channelCustomerUpdate(@PathVariable Integer id,
-                                        @RequestBody ChannelCustomer channelCustomer){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iChannelCustomerService.updateById(channelCustomer)){
-                responseBean.addSuccess(channelCustomer);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("channelCustomerUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
+                                        @RequestBody ChannelCustomerDTO channelCustomerDTO){
+        return iChannelCustomerService.auditCustomer(id,channelCustomerDTO);
     }
 
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/channelCustomer/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/channelCustomer/{id}",method= RequestMethod.GET)
     public ResponseBean channelCustomerGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -253,4 +253,26 @@ public class CurriculumController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "wx-根据id查询课程表详情", notes = "wx-根据id查询课程表详情")
+    @RequestMapping(value="/wx/curriculum/{id}",method= RequestMethod.GET)
+    public ResponseBean curriculum(@PathVariable String id,
+                                      @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Curriculum curriculum = iCurriculumService.getById(id);
+            curriculum.setLookNum(curriculum.getLookNum() + 1);
+            iCurriculumService.updateById(curriculum);
+            responseBean.addSuccess(curriculum);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,35 @@
+package com.yunzhi.marketing.xlk.dto;
+
+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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_channel_customer")
+public class ChannelCustomerDTO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String channelCustomerId;
+
+    /**
+     * 审核结果 pass 通过  fail 失败
+     */
+    private String auditResult;
+
+}

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

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.xlk.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -82,7 +83,7 @@ public class ChannelCustomer implements Serializable {
     /**
      * 渠道id
      */
-    private String channelId;
+    private Integer channelId;
 
 
 }

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

@@ -1,6 +1,8 @@
 package com.yunzhi.marketing.xlk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.dto.ChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 
 /**
@@ -13,4 +15,11 @@ import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
  */
 public interface IChannelCustomerService extends IService<ChannelCustomer> {
 
+    /**
+     * 审核
+     * @param id
+     * @param channelCustomerDTO
+     * @return
+     */
+    ResponseBean auditCustomer(Integer id, ChannelCustomerDTO channelCustomerDTO);
 }

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

@@ -1,11 +1,20 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaRecommendCustomer;
+import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
+import com.yunzhi.marketing.xlk.dto.ChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 渠道报备客户表  服务实现类
@@ -17,4 +26,49 @@ import org.springframework.stereotype.Service;
 @Service
 public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMapper, ChannelCustomer> implements IChannelCustomerService {
 
+    @Autowired
+    private ChannelCustomerMapper channelCustomerMapper;
+
+    @Autowired
+    private TaRecommendCustomerMapper taRecommendCustomerMapper;
+
+    /**
+     * 审核
+     *
+     * @param id
+     * @param channelCustomerDTO
+     * @return
+     */
+    @Override
+    public ResponseBean auditCustomer(Integer id, ChannelCustomerDTO channelCustomerDTO) {
+        ChannelCustomer customer = channelCustomerMapper.selectById(id);
+        if ("fail".equals(channelCustomerDTO.getAuditResult())){
+            // 审核不通过
+            customer.setStatus("3");
+            channelCustomerMapper.updateById(customer);
+            return ResponseBean.success("审核成功");
+        }
+
+        // 审核通过 先查看在ta_recommend_customer 手机号是否存在
+        LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaRecommendCustomer::getPhone,customer.getPhone());
+        queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
+        if (null == taRecommendCustomer) {
+            // 审核通过
+            customer.setStatus("2");
+            channelCustomerMapper.updateById(customer);
+            return ResponseBean.success("审核成功");
+        }
+
+        if (StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant()) &&
+                (StringUtils.isEmpty(taRecommendCustomer.getRecommendPerson()) || taRecommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
+            // 审核通过
+            customer.setStatus("2");
+            channelCustomerMapper.updateById(customer);
+            return ResponseBean.success("审核成功");
+        }
+
+        return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
+    }
 }