魏超 5 лет назад
Родитель
Сommit
172b44f6b2

+ 1
- 1
pom.xml Просмотреть файл

10
 	</parent>
10
 	</parent>
11
 	<groupId>com.huiju</groupId>
11
 	<groupId>com.huiju</groupId>
12
 	<artifactId>estateagents</artifactId>
12
 	<artifactId>estateagents</artifactId>
13
-	<version>v3.5.2.2</version>
13
+	<version>v3.5.5</version>
14
 	<name>estateages</name>
14
 	<name>estateages</name>
15
 	<description>置业经纪人</description>
15
 	<description>置业经纪人</description>
16
 
16
 

+ 11
- 1
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java Просмотреть файл

18
 import org.springframework.web.bind.annotation.*;
18
 import org.springframework.web.bind.annotation.*;
19
 
19
 
20
 import javax.servlet.http.HttpServletRequest;
20
 import javax.servlet.http.HttpServletRequest;
21
+import java.lang.reflect.Method;
21
 import java.time.LocalDateTime;
22
 import java.time.LocalDateTime;
22
 import java.time.ZoneOffset;
23
 import java.time.ZoneOffset;
23
 import java.util.List;
24
 import java.util.List;
50
     public ITaPersonIntentionRecordService personIntentionRecordService;
51
     public ITaPersonIntentionRecordService personIntentionRecordService;
51
     @Autowired
52
     @Autowired
52
     public ITaBuildingService buildingService;
53
     public ITaBuildingService buildingService;
54
+    @Autowired
55
+    private ITaRecommendCustomerService taRecommendCustomerService;
56
+
53
 
57
 
54
 
58
 
55
     /**
59
     /**
349
     public ResponseBean getSharePersonList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
353
     public ResponseBean getSharePersonList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
350
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
354
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
351
                                            @RequestParam(value = "userId") Integer userId,
355
                                            @RequestParam(value = "userId") Integer userId,
352
-                                           @RequestParam(value = "targetId")Integer targetId,
356
+                                           @RequestParam(value = "targetId")String targetId,
353
                                            HttpServletRequest request){
357
                                            HttpServletRequest request){
354
         try {
358
         try {
355
             //使用分页插件
359
             //使用分页插件
362
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
366
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
363
         }
367
         }
364
     }
368
     }
369
+
370
+    @RequestMapping(value = "/wx/judgeBindCustomer", method = RequestMethod.GET)
371
+    public ResponseBean judgeBindCustomer(@RequestParam("customerId")String customerId, @RequestParam("recommendPersonId") String recommendPersonId){
372
+        boolean judgeBindCustomerFlag = taRecommendCustomerService.judgeBindCustomer(customerId, recommendPersonId);
373
+        return ResponseBean.success(judgeBindCustomerFlag);
374
+    }
365
 }
375
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java Просмотреть файл

4
 
4
 
5
 @Data
5
 @Data
6
 public class TaConsultantInfo {
6
 public class TaConsultantInfo {
7
-    private Integer targetId;
7
+    private String targetId;
8
 
8
 
9
     private String shareType;
9
     private String shareType;
10
 
10
 

+ 2
- 2
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java Просмотреть файл

80
 
80
 
81
     IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
81
     IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
82
 
82
 
83
-    Integer countShareNumByEventType(@Param("targetId") Integer targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
83
+    Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
84
 
84
 
85
-    IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, @Param("orgId") Integer orgId, @Param("userId")Integer userId, @Param("targetId")Integer targetId);
85
+    IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, @Param("orgId") Integer orgId, @Param("userId")Integer userId, @Param("targetId")String targetId);
86
 }
86
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/ITaPersonVisitRecordService.java Просмотреть файл

53
 
53
 
54
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
54
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
55
 
55
 
56
-	Integer countShareNumByEventType(Integer targetId, Integer orgId, Integer userId, String eventType);
56
+	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType);
57
 
57
 
58
-	IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, Integer targetId);
58
+	IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, String targetId);
59
 }
59
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java Просмотреть файл

148
      * @return
148
      * @return
149
      */
149
      */
150
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
150
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
151
+
152
+    boolean judgeBindCustomer(String customerId, String recommendPersonId);
151
 }
153
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java Просмотреть файл

146
 	}
146
 	}
147
 
147
 
148
 	@Override
148
 	@Override
149
-	public Integer countShareNumByEventType(Integer targetId, Integer orgId, Integer userId, String eventType) {
149
+	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType) {
150
 		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
150
 		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
151
 	}
151
 	}
152
 
152
 
153
 	@Override
153
 	@Override
154
-	public IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, Integer targetId) {
154
+	public IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, String targetId) {
155
 		IPage<TaPerson> result = personVisitRecordMapper.getSharePersonList(pg, orgId, userId, targetId);
155
 		IPage<TaPerson> result = personVisitRecordMapper.getSharePersonList(pg, orgId, userId, targetId);
156
 		return result;
156
 		return result;
157
 	}
157
 	}

+ 11
- 0
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Просмотреть файл

872
         taCustomerFollowUpRecord.setCustomerSex(taRecommendCustomer.getSex());
872
         taCustomerFollowUpRecord.setCustomerSex(taRecommendCustomer.getSex());
873
         customerFollowUpRecordMapper.insert(taCustomerFollowUpRecord);
873
         customerFollowUpRecordMapper.insert(taCustomerFollowUpRecord);
874
     }
874
     }
875
+
876
+    public boolean judgeBindCustomer(String customerId, String recommendPersonId){
877
+        QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
878
+        taRecommendCustomerQueryWrapper.eq("customer_id", customerId);
879
+        taRecommendCustomerQueryWrapper.eq("",recommendPersonId);
880
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(taRecommendCustomerQueryWrapper);
881
+        if (taRecommendCustomer != null){
882
+            return true;
883
+        }
884
+        return false;
885
+    }
875
 }
886
 }

+ 1
- 0
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Просмотреть файл

223
         a.org_id = #{orgId}
223
         a.org_id = #{orgId}
224
         and a.target_id = #{targetId}
224
         and a.target_id = #{targetId}
225
         and a.consultant_id = #{userId}
225
         and a.consultant_id = #{userId}
226
+        and a.person_id != a.share_person_id
226
         group by a.person_id order by a.visit_time desc
227
         group by a.person_id order by a.visit_time desc
227
     </select>
228
     </select>
228
 
229