胡轶钦 5 年之前
父節點
當前提交
f0887c0ecc

+ 24
- 15
src/main/java/com/huiju/estateagents/controller/TaPersonController.java 查看文件

510
                 QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
510
                 QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
511
                 channelQueryWrapper.eq("channel_code",channelCode);
511
                 channelQueryWrapper.eq("channel_code",channelCode);
512
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
512
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
513
-                TaChannel channel = taChannelService.getOne(channelQueryWrapper);
514
-                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
515
-                channelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
516
-                channelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
517
-                int count = taChannelPersonService.count(channelPersonQueryWrapper);
518
-                if(count >0){
519
-                    return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
513
+                List<TaChannel> channel = taChannelService.list(channelQueryWrapper);
514
+                if(channel.size()>0){
515
+                    channelPersonQueryWrapper.eq("person_id",person.getPersonId());
516
+                    channelPersonQueryWrapper.eq("channel_id",channel.get(0).getChannelId());
517
+                    channelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
518
+                    int count = taChannelPersonService.count(channelPersonQueryWrapper);
519
+                    if(count >0){
520
+                        return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
521
+                    }
522
+                    TaChannelPerson channelPerson = new TaChannelPerson();
523
+                    channelPerson.setCreateDate(LocalDateTime.now());
524
+                    channelPerson.setPersonId(person.getPersonId());
525
+                    channelPerson.setChannelId(channel.get(0).getChannelId());
526
+                    channelPerson.setStatus(CommConstant.STATUS_NORMAL);
527
+                    taChannelPersonService.save(channelPerson);
528
+                }else {
529
+                    responseBean.addError("渠道码错误");
520
                 }
530
                 }
521
-                TaChannelPerson channelPerson = new TaChannelPerson();
522
-                channelPerson.setCreateDate(LocalDateTime.now());
523
-                channelPerson.setPersonId(person.getPersonId());
524
-                channelPerson.setChannelId(channel.getChannelId());
525
-                channelPerson.setStatus(CommConstant.STATUS_NORMAL);
526
-                taChannelPersonService.save(channelPerson);
531
+
527
             }else {
532
             }else {
528
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
533
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
529
                 channelPersonQueryWrapper.eq("person_id",person.getPersonId());
534
                 channelPersonQueryWrapper.eq("person_id",person.getPersonId());
563
         }
568
         }
564
         TaPerson person = taPersons.get(0);
569
         TaPerson person = taPersons.get(0);
565
         QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
570
         QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
566
-        queryWrapper.eq("recommend_agent",person.getRecommendAgent());
571
+        queryWrapper.eq("recommend_agent",person.getPersonId());
567
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
572
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
568
         Page<TaPerson>page = new Page<>();
573
         Page<TaPerson>page = new Page<>();
569
         page.setPages(pageNum);
574
         page.setPages(pageNum);
617
         JSONObject resultJson = JSONObject.parseObject(result);
622
         JSONObject resultJson = JSONObject.parseObject(result);
618
         if (!resultJson.getString("status").equals(CommConstant.STATUS_NORMAL)){
623
         if (!resultJson.getString("status").equals(CommConstant.STATUS_NORMAL)){
619
             String adcode =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("adcode");
624
             String adcode =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("adcode");
625
+            String cityName =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("city");
620
             adcode = adcode.substring(0,adcode.length()-2) + "00";
626
             adcode = adcode.substring(0,adcode.length()-2) + "00";
621
             person.setCity(adcode);
627
             person.setCity(adcode);
622
             taPersonService.updateById(person);
628
             taPersonService.updateById(person);
623
-            responseBean.addSuccess("保存城市成功");
629
+            Map<Object,Object> data = new HashMap<>();
630
+            data.put("cityName",cityName);
631
+            data.put("cityCode",adcode);
632
+            responseBean.addSuccess(data);
624
             return responseBean;
633
             return responseBean;
625
         }
634
         }
626
         responseBean.addError("未找到城市");
635
         responseBean.addError("未找到城市");

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 查看文件

193
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
193
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
194
             queryWrapper.eq("realty_consultant",person.getPersonId());
194
             queryWrapper.eq("realty_consultant",person.getPersonId());
195
            // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
195
            // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
196
-            queryWrapper.gt("status",CommConstant.CUSTOMER_REPORT);
196
+            queryWrapper.gt("status",CommConstant.STATUS_UNACCALIMED);
197
             queryWrapper.orderByDesc("create_date");
197
             queryWrapper.orderByDesc("create_date");
198
             IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
198
             IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
199
             return ResponseBean.success(result);
199
             return ResponseBean.success(result);

+ 5
- 0
src/main/java/com/huiju/estateagents/entity/TaChannelPerson.java 查看文件

1
 package com.huiju.estateagents.entity;
1
 package com.huiju.estateagents.entity;
2
 
2
 
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
3
 import com.baomidou.mybatisplus.annotation.TableName;
5
 import com.baomidou.mybatisplus.annotation.TableName;
4
 import java.time.LocalDateTime;
6
 import java.time.LocalDateTime;
5
 import java.io.Serializable;
7
 import java.io.Serializable;
23
 
25
 
24
     private static final long serialVersionUID = 1L;
26
     private static final long serialVersionUID = 1L;
25
 
27
 
28
+    @TableId(value = "channel_person_id", type = IdType.AUTO)
29
+    private Integer channelPersonId;
30
+
26
     /**
31
     /**
27
      * 人员id
32
      * 人员id
28
      */
33
      */