bugfix

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

@@ -510,20 +510,25 @@ public class TaPersonController extends BaseController {
                 QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
                 channelQueryWrapper.eq("channel_code",channelCode);
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
-                TaChannel channel = taChannelService.getOne(channelQueryWrapper);
-                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
-                channelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
-                channelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
-                int count = taChannelPersonService.count(channelPersonQueryWrapper);
-                if(count >0){
-                    return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
+                List<TaChannel> channel = taChannelService.list(channelQueryWrapper);
+                if(channel.size()>0){
+                    channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                    channelPersonQueryWrapper.eq("channel_id",channel.get(0).getChannelId());
+                    channelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+                    int count = taChannelPersonService.count(channelPersonQueryWrapper);
+                    if(count >0){
+                        return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
+                    }
+                    TaChannelPerson channelPerson = new TaChannelPerson();
+                    channelPerson.setCreateDate(LocalDateTime.now());
+                    channelPerson.setPersonId(person.getPersonId());
+                    channelPerson.setChannelId(channel.get(0).getChannelId());
+                    channelPerson.setStatus(CommConstant.STATUS_NORMAL);
+                    taChannelPersonService.save(channelPerson);
+                }else {
+                    responseBean.addError("渠道码错误");
                 }
-                TaChannelPerson channelPerson = new TaChannelPerson();
-                channelPerson.setCreateDate(LocalDateTime.now());
-                channelPerson.setPersonId(person.getPersonId());
-                channelPerson.setChannelId(channel.getChannelId());
-                channelPerson.setStatus(CommConstant.STATUS_NORMAL);
-                taChannelPersonService.save(channelPerson);
+
             }else {
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
                 channelPersonQueryWrapper.eq("person_id",person.getPersonId());
@@ -563,7 +568,7 @@ public class TaPersonController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("recommend_agent",person.getRecommendAgent());
+        queryWrapper.eq("recommend_agent",person.getPersonId());
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         Page<TaPerson>page = new Page<>();
         page.setPages(pageNum);
@@ -617,10 +622,14 @@ public class TaPersonController extends BaseController {
         JSONObject resultJson = JSONObject.parseObject(result);
         if (!resultJson.getString("status").equals(CommConstant.STATUS_NORMAL)){
             String adcode =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("adcode");
+            String cityName =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("city");
             adcode = adcode.substring(0,adcode.length()-2) + "00";
             person.setCity(adcode);
             taPersonService.updateById(person);
-            responseBean.addSuccess("保存城市成功");
+            Map<Object,Object> data = new HashMap<>();
+            data.put("cityName",cityName);
+            data.put("cityCode",adcode);
+            responseBean.addSuccess(data);
             return responseBean;
         }
         responseBean.addError("未找到城市");

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

@@ -193,7 +193,7 @@ public class TaRecommendCustomerController extends BaseController {
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("realty_consultant",person.getPersonId());
            // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
-            queryWrapper.gt("status",CommConstant.CUSTOMER_REPORT);
+            queryWrapper.gt("status",CommConstant.STATUS_UNACCALIMED);
             queryWrapper.orderByDesc("create_date");
             IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
             return ResponseBean.success(result);

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -23,6 +25,9 @@ public class TaChannelPerson implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "channel_person_id", type = IdType.AUTO)
+    private Integer channelPersonId;
+
     /**
      * 人员id
      */