Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

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

@@ -231,6 +231,20 @@ public class TaPersonController extends BaseController {
         return taPersonService.getCardDetail(openid, id,person.getPersonId());
     }
 
+    /**
+     * 获取名片详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/wx/onePerson/{id}")
+    public ResponseBean getPersonByPersonId(@PathVariable String id, HttpServletRequest request) {
+        if (isEmpty(id)) {
+            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        TaPerson person = taPersonService.getById(id);
+        return ResponseBean.success(person);
+    }
+
     /**
      * 找回密码
      * @param plat 平台类型 wx 是微信相关, admin 是后台管理系统

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

@@ -281,6 +281,16 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
             // 获取未读消息数量
             Integer unReadNum = taChatMapper.getUnReadMessage(person.getPersonId(), currentPerson.getPersonId());
+            QueryWrapper<TaRecommendCustomer> recommendCustomerQueryWrapper = new QueryWrapper<>();
+            recommendCustomerQueryWrapper.in("building_id",buildings);
+            recommendCustomerQueryWrapper.eq("person_id",personId);
+            recommendCustomerQueryWrapper.isNotNull("recommend_person");
+            Integer count = iTaRecommendCustomerService.count(recommendCustomerQueryWrapper);
+            if(count>0){
+                result.put("isReport",true);
+            }else {
+                result.put("isReport",false);
+            }
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
         } else {
             result.put("liked", true);