提交

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.2.2</version>
+	<version>v3.5.5</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
@@ -50,6 +51,9 @@ public class TaPersonVisitRecordController extends BaseController {
     public ITaPersonIntentionRecordService personIntentionRecordService;
     @Autowired
     public ITaBuildingService buildingService;
+    @Autowired
+    private ITaRecommendCustomerService taRecommendCustomerService;
+
 
 
     /**
@@ -349,7 +353,7 @@ public class TaPersonVisitRecordController extends BaseController {
     public ResponseBean getSharePersonList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            @RequestParam(value = "userId") Integer userId,
-                                           @RequestParam(value = "targetId")Integer targetId,
+                                           @RequestParam(value = "targetId")String targetId,
                                            HttpServletRequest request){
         try {
             //使用分页插件
@@ -362,4 +366,10 @@ public class TaPersonVisitRecordController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+
+    @RequestMapping(value = "/wx/judgeBindCustomer", method = RequestMethod.GET)
+    public ResponseBean judgeBindCustomer(@RequestParam("customerId")String customerId, @RequestParam("recommendPersonId") String recommendPersonId){
+        boolean judgeBindCustomerFlag = taRecommendCustomerService.judgeBindCustomer(customerId, recommendPersonId);
+        return ResponseBean.success(judgeBindCustomerFlag);
+    }
 }

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

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class TaConsultantInfo {
-    private Integer targetId;
+    private String targetId;
 
     private String shareType;
 

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

@@ -80,7 +80,7 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
 
     IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
 
-    Integer countShareNumByEventType(@Param("targetId") Integer targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
+    Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
 
-    IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, @Param("orgId") Integer orgId, @Param("userId")Integer userId, @Param("targetId")Integer targetId);
+    IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, @Param("orgId") Integer orgId, @Param("userId")Integer userId, @Param("targetId")String targetId);
 }

src/main/java/com/huiju/estateagents/service/ITaPersonVisitRecordService.java

@@ -53,7 +53,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
 
-	Integer countShareNumByEventType(Integer targetId, Integer orgId, Integer userId, String eventType);
+	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType);
 
-	IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, Integer targetId);
+	IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, String targetId);
 }

src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java

@@ -148,4 +148,6 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
+
+    boolean judgeBindCustomer(String customerId, String recommendPersonId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java

@@ -146,12 +146,12 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	}
 
 	@Override
-	public Integer countShareNumByEventType(Integer targetId, Integer orgId, Integer userId, String eventType) {
+	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType) {
 		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
 	}
 
 	@Override
-	public IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, Integer targetId) {
+	public IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, String targetId) {
 		IPage<TaPerson> result = personVisitRecordMapper.getSharePersonList(pg, orgId, userId, targetId);
 		return result;
 	}

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -872,4 +872,15 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taCustomerFollowUpRecord.setCustomerSex(taRecommendCustomer.getSex());
         customerFollowUpRecordMapper.insert(taCustomerFollowUpRecord);
     }
+
+    public boolean judgeBindCustomer(String customerId, String recommendPersonId){
+        QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
+        taRecommendCustomerQueryWrapper.eq("customer_id", customerId);
+        taRecommendCustomerQueryWrapper.eq("",recommendPersonId);
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(taRecommendCustomerQueryWrapper);
+        if (taRecommendCustomer != null){
+            return true;
+        }
+        return false;
+    }
 }

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -223,6 +223,7 @@
         a.org_id = #{orgId}
         and a.target_id = #{targetId}
         and a.consultant_id = #{userId}
+        and a.person_id != a.share_person_id
         group by a.person_id order by a.visit_time desc
     </select>