Browse Source

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

魏熙美 5 years ago
parent
commit
bbe336aaff

+ 14
- 0
src/main/java/com/huiju/estateagents/controller/TaPersonController.java View File

231
         return taPersonService.getCardDetail(openid, id,person.getPersonId());
231
         return taPersonService.getCardDetail(openid, id,person.getPersonId());
232
     }
232
     }
233
 
233
 
234
+    /**
235
+     * 获取名片详情
236
+     * @param id
237
+     * @return
238
+     */
239
+    @GetMapping("/wx/onePerson/{id}")
240
+    public ResponseBean getPersonByPersonId(@PathVariable String id, HttpServletRequest request) {
241
+        if (isEmpty(id)) {
242
+            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
243
+        }
244
+        TaPerson person = taPersonService.getById(id);
245
+        return ResponseBean.success(person);
246
+    }
247
+
234
     /**
248
     /**
235
      * 找回密码
249
      * 找回密码
236
      * @param plat 平台类型 wx 是微信相关, admin 是后台管理系统
250
      * @param plat 平台类型 wx 是微信相关, admin 是后台管理系统

+ 10
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java View File

281
 
281
 
282
             // 获取未读消息数量
282
             // 获取未读消息数量
283
             Integer unReadNum = taChatMapper.getUnReadMessage(person.getPersonId(), currentPerson.getPersonId());
283
             Integer unReadNum = taChatMapper.getUnReadMessage(person.getPersonId(), currentPerson.getPersonId());
284
+            QueryWrapper<TaRecommendCustomer> recommendCustomerQueryWrapper = new QueryWrapper<>();
285
+            recommendCustomerQueryWrapper.in("building_id",buildings);
286
+            recommendCustomerQueryWrapper.eq("person_id",personId);
287
+            recommendCustomerQueryWrapper.isNotNull("recommend_person");
288
+            Integer count = iTaRecommendCustomerService.count(recommendCustomerQueryWrapper);
289
+            if(count>0){
290
+                result.put("isReport",true);
291
+            }else {
292
+                result.put("isReport",false);
293
+            }
284
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
294
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
285
         } else {
295
         } else {
286
             result.put("liked", true);
296
             result.put("liked", true);