2

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

 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+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.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaChannel;
+import com.yunzhi.marketing.entity.TaChannelPerson;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.excel.handler.CustomCellWriteHandler;
 import com.yunzhi.marketing.mapper.TaChannelMapper;
 import com.yunzhi.marketing.service.ITaPersonService;
+import com.yunzhi.marketing.service.TaChannelPersonService;
 import com.yunzhi.marketing.service.TaChannelService;
 import com.yunzhi.marketing.excel.ActivityStatistics.ChannelAddRegistNum;
 import com.yunzhi.marketing.excel.ActivityStatistics.ChannelVisitNum;
     @Autowired
     public TaChannelMapper taChannelMapper;
 
+    @Autowired
+    private TaChannelPersonService taChannelPersonService;
+
 
     /**
      * 渠道管理列表
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
     })
     @ResponseBody
-    @RequestMapping(value="/channel/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/channel/{id}", method= RequestMethod.DELETE)
     public ResponseBean channelDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(taChannelService.removeById(id)){
+            TaChannel taChannel = taChannelService.getById(id);
+            taChannel.setStatus(CommConstant.STATUS_DELETE);
+            if(taChannelService.updateById(taChannel)){
+                // 删除成功后更新此渠道的所有的经纪人为普通客户
+                LambdaQueryWrapper<TaChannelPerson> channelPersonLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                channelPersonLambdaQueryWrapper.eq(TaChannelPerson::getChannelId,id);
+                //查询出所有的渠道person
+                List<TaChannelPerson> list = taChannelPersonService.list(channelPersonLambdaQueryWrapper);
+                TaChannelPerson taChannelPerson = new TaChannelPerson();
+                taChannelPerson.setStatus(CommConstant.STATUS_DELETE);
+                // 把所有的渠道person 更新为删除状态
+                taChannelPersonService.update(taChannelPerson, channelPersonLambdaQueryWrapper);
+
+                // 把所有的person的type 更新为普通用户
+                list.forEach(e -> {
+                    TaPerson taPerson = taPersonService.getById(e.getPersonId());
+                    taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
+                    taPersonService.updateById(taPerson);
+                });
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
         return responseBean;
     }
 
+    @ResponseBody
+    @RequestMapping(value="/admin/channelPerson/{personId}", method= RequestMethod.DELETE)
+    public ResponseBean channelPersonDelete(@PathVariable String personId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 删除成功后更新此渠道的所有的经纪人为普通客户
+            LambdaQueryWrapper<TaChannelPerson> channelPersonLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            channelPersonLambdaQueryWrapper.eq(TaChannelPerson::getPersonId,personId);
+            TaChannelPerson taChannelPerson = new TaChannelPerson();
+            taChannelPerson.setStatus(CommConstant.STATUS_DELETE);
+            // 把所有的渠道person 更新为删除状态
+            taChannelPersonService.update(taChannelPerson, channelPersonLambdaQueryWrapper);
+
+            // 更新为普通用户
+            TaPerson taPerson = taPersonService.getById(personId);
+            taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
+            taPersonService.updateById(taPerson);
+            responseBean.addSuccess("success");
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 修改对象
      * @param id  实体ID

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

      */
     private String buildingId;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
     /**
      * 说明描述
      */

src/main/resources/mapper/TaChannelMapper.xml

         FROM
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
-        LEFT JOIN ta_person tp ON cp.person_id = tp.person_id 	AND tp.person_type = 'estate agent' 	AND cp.STATUS = 1
+        LEFT JOIN ta_person tp ON cp.person_id = tp.person_id	AND cp.STATUS = 1
         LEFT JOIN (
         SELECT sum(new_customers) as customerNum,qr_code_id,channel_id,org_id from ts_channel_daily where channel_id is not null and org_id = #{orgId} GROUP BY channel_id) ts on c.channel_id = ts.channel_id
         <where>
                 c.channel_id = #{channelId}
             </if>
             and c.org_id = #{orgId}
+            and c.status = 1
         </where>
         GROUP BY c.channel_id
     </select>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         left join ta_channel_person tcp on a.person_id = tcp.person_id
         left join ta_channel tc on tc.channel_id = tcp.channel_id
         <where>
-            a.person_type in ('estate agent', 'channel agent')
+            a.person_type in ('channel agent')
             and a.status >0
             <if test="name != null and name !=''">
                 and a.nickname = #{name}