渠道管理

src/main/java/com/huiju/estateagents/controller/TaChannelController.java

@@ -6,10 +6,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.TaChannelService;
+import org.apache.http.HttpRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +26,10 @@ 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;
+import java.util.HashMap;
+import java.util.List;
+
 
 /**
  * <p>
@@ -42,6 +51,9 @@ public class TaChannelController extends BaseController {
     @Autowired
     public ITaPersonService taPersonService;
 
+    @Autowired
+    public TaChannelMapper taChannelMapper;
+
 
     /**
      * 分页查询列表
@@ -51,16 +63,25 @@ public class TaChannelController extends BaseController {
      */
     @RequestMapping(value="/admin/channel",method= RequestMethod.GET)
     public ResponseBean channelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value ="channelId",required = false) Integer channelId,
+                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String orgid = JWTUtils.getSubject(request);
         try {
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(null != channelId, "channel_id", channelId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaChannel> result = taChannelService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
+          HashMap hashMap  = new HashMap<>();
+            hashMap.put("result",result);
+            // 下拉列表的数据 all
+            List<TaChannel> taChannelList = taChannelMapper.selectChannelList();
+            hashMap.put("channelNmae",taChannelList);
+            responseBean.addSuccess(hashMap);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("channelList -=- {}",e.toString());
@@ -74,10 +95,13 @@ public class TaChannelController extends BaseController {
      * @param channel 实体对象
      * @return
      */
-    @RequestMapping(value="/channel",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/channel",method= RequestMethod.POST)
     public ResponseBean channelAdd(@RequestBody TaChannel channel){
         ResponseBean responseBean = new ResponseBean();
         try {
+            // 生成6位数的渠道码
+            int channelCode= taChannelMapper.channelCode();
+            channel.setChannelCode(String.valueOf(channelCode));
             if (taChannelService.save(channel)){
                 responseBean.addSuccess(channel);
             }else {
@@ -157,13 +181,11 @@ public class TaChannelController extends BaseController {
     /**
      * 渠道管理下的经纪人
      */
-    @RequestMapping(value="/channel/broker",method= RequestMethod.GET)
-    public  ResponseBean channelBrokerList(@RequestBody String  Param,
+    @RequestMapping(value="/admin/channel/broker",method= RequestMethod.GET)
+    public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
+                                           @RequestParam(value="phone",required = false) String phone,
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        JSONObject jSONObject = JSONObject.parseObject(Param);
-        String name = jSONObject.getString("name");
-        String phone = jSONObject.getString("phone");
         ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize);
         return taPerson;
     }

src/main/java/com/huiju/estateagents/controller/TaChannelPersonController.java

@@ -51,7 +51,6 @@ public class TaChannelPersonController extends BaseController {
             //使用分页插件
 		    IPage<TaChannelPerson> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaChannelPerson> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("channel_name",channelName);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaChannelPerson> result = iChannelPersonService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -234,4 +234,7 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private Integer isSave;
+
+    @TableField(exist = false)
+    private int recommendCount;
 }

src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaChannel;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  *   Mapper 接口
@@ -15,4 +17,15 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaChannelMapper extends BaseMapper<TaChannel> {
 
+    /**
+     * 渠道码
+     * @return
+     */
+    int channelCode();
+
+    /**
+     * 渠道页面下拉列表的所有数据
+     * @return
+     */
+    List<TaChannel> selectChannelList();
 }

src/main/resources/mapper/TaChannelMapper.xml

@@ -2,4 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaChannelMapper">
 
+    <select id="channelCode" resultType="int">
+        drop FUNCTION if exists roundNum;
+        create function roundNum() returns int
+        begin
+        declare x int default 1;
+        declare y int default 0;
+        declare a int default 20;
+        declare b int default 1;
+        while (b <![CDATA[ < a ]]> ) do
+        set x = (select (select FLOOR(100000 + RAND()*900000))  as num);
+        set y = (select count(1) from ta_channel where channel_code = x);
+        if y = 0
+        then return x;
+        END IF;
+        set b = b + 1;
+        end while;
+        return 0;
+        end;
+        select roundNum();
+    </select>
+    
+    <select id="selectChannelList" resultType="com.huiju.estateagents.entity.TaChannel">
+        select * from ta_channel ;
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -490,7 +490,14 @@ FROM
     </select>
 
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
-        select * from ta_person
+        select
+        p.avatarurl,
+        p.name,
+        p.tel,
+        p.sex,
+        COUNT(rc.person_id) as recommendCount
+        from ta_person p
+        LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id and rc.report_recommend_status = 1
         <where>
         <if test="name !=null and name !=''">
             and name = #{name}
@@ -500,6 +507,7 @@ FROM
         </if>
         and person_type = 'estate agent'
         </where>
+        GROUP BY p.person_id
     </select>
 
 </mapper>