胡轶钦 5 years ago
parent
commit
bfe2c35202

+ 48
- 5
src/main/java/com/huiju/estateagents/controller/TaPersonController.java View File

4
 import com.alibaba.fastjson.JSONObject;
4
 import com.alibaba.fastjson.JSONObject;
5
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
7
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.center.taUser.entity.TaUser;
9
 import com.huiju.estateagents.center.taUser.entity.TaUser;
9
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
10
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
89
     }
90
     }
90
 
91
 
91
     @PutMapping("/wx/registerConsultant")
92
     @PutMapping("/wx/registerConsultant")
92
-    public ResponseBean registerConsultant(HttpServletRequest request) {
93
+    public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone) {
93
         Integer orgId =getOrgId(request);
94
         Integer orgId =getOrgId(request);
94
         ResponseBean responseBean = new ResponseBean();
95
         ResponseBean responseBean = new ResponseBean();
95
         String openid = JWTUtils.getSubject(request);
96
         String openid = JWTUtils.getSubject(request);
99
         }
100
         }
100
         TaPerson person = taPersons.get(0);
101
         TaPerson person = taPersons.get(0);
101
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
102
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
102
-        queryWrapper.eq("phone",person.getPhone());
103
+        queryWrapper.eq("phone",phone);
103
         queryWrapper.eq("org_id",orgId);
104
         queryWrapper.eq("org_id",orgId);
104
         List<TaUser> users = taUserService.list(queryWrapper);
105
         List<TaUser> users = taUserService.list(queryWrapper);
105
         if(users.size()>0){
106
         if(users.size()>0){
116
     }
117
     }
117
 
118
 
118
     @PutMapping("/wx/registerAgent")
119
     @PutMapping("/wx/registerAgent")
119
-    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,HttpServletRequest request) {
120
+    public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
120
         ResponseBean responseBean = new ResponseBean();
121
         ResponseBean responseBean = new ResponseBean();
121
         Integer orgId =getOrgId(request);
122
         Integer orgId =getOrgId(request);
122
         String openid = JWTUtils.getSubject(request);
123
         String openid = JWTUtils.getSubject(request);
466
      * @param channelCode 渠道码
467
      * @param channelCode 渠道码
467
      * @return
468
      * @return
468
      */
469
      */
469
-    @RequestMapping(value="/wx/customer/recommend/becomeChannel/{channelCode}",method= RequestMethod.PUT)
470
-    public ResponseBean taRecommendAgentBecomeChannel(@PathVariable String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
470
+    @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
471
+    public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
471
         ResponseBean responseBean = new ResponseBean();
472
         ResponseBean responseBean = new ResponseBean();
472
         String openid = JWTUtils.getSubject(request);
473
         String openid = JWTUtils.getSubject(request);
473
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
474
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
519
     }
520
     }
520
 
521
 
521
 
522
 
523
+    /**
524
+     * 获取名片详情
525
+     * @return
526
+     */
527
+    @GetMapping("/wx/agent/recommend/mine")
528
+    public ResponseBean getAgentIRecommend(@RequestParam(defaultValue = "1") int pageNum,
529
+                                           @RequestParam(defaultValue = "10") int pageSize, HttpServletRequest request) {
530
+        String openid = JWTUtils.getSubject(request);
531
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
532
+        if (null == taPersons || taPersons.size() != 1) {
533
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
534
+        }
535
+        TaPerson person = taPersons.get(0);
536
+        QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
537
+        queryWrapper.eq("recommend_agent",person.getRecommendAgent());
538
+        queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
539
+        Page<TaPerson>page = new Page<>();
540
+        page.setPages(pageNum);
541
+        page.setCurrent(pageNum);
542
+        page.setSize(pageSize);
543
+        ResponseBean responseBean = new ResponseBean();
544
+        IPage<TaPerson>data = taPersonService.page(page,queryWrapper);
545
+        responseBean.addSuccess(data);
546
+
547
+        return responseBean;
548
+    }
549
+
550
+    /**
551
+     * 获取当前用户
552
+     * @param request
553
+     * @return
554
+     */
555
+    @GetMapping("/wx/user/current")
556
+    public ResponseBean getWxCurrentPerson(HttpServletRequest request) {
557
+        String personId = JWTUtils.getSubject(request);
558
+        TaPerson taPerson = taPersonService.getById(personId);
559
+        if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
560
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
561
+        }
562
+
563
+        return ResponseBean.success(taPerson);
564
+    }
522
 
565
 
523
 }
566
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java View File

312
         }
312
         }
313
     }
313
     }
314
 
314
 
315
-    @GetMapping("/wx/customer/recommend/{customerId}")
315
+    @GetMapping("/wx/customer/recommend/mine")
316
     public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
316
     public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
317
         Integer orgId =getOrgId(request);
317
         Integer orgId =getOrgId(request);
318
         String openid = JWTUtils.getSubject(request);
318
         String openid = JWTUtils.getSubject(request);

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

241
         result.put("name", user.getUserName());
241
         result.put("name", user.getUserName());
242
         result.put("company", user.getOrgName());
242
         result.put("company", user.getOrgName());
243
         result.put("department", user.getDepartment());
243
         result.put("department", user.getDepartment());
244
-        result.put("picture", person.getPhoto());
244
+        result.put("picture", user.getPhoto());
245
         result.put("hotNum", person.getHotNum());
245
         result.put("hotNum", person.getHotNum());
246
         result.put("likeNum", person.getLikeNum());
246
         result.put("likeNum", person.getLikeNum());
247
         result.put("pvNum", person.getPvNum());
247
         result.put("pvNum", person.getPvNum());
248
         result.put("post", person.getPost());
248
         result.put("post", person.getPost());
249
-        result.put("phone", person.getTel());
249
+        result.put("phone", user.getPhone());
250
         result.put("avatar",user.getAvatar());
250
         result.put("avatar",user.getAvatar());
251
         result.put("visitors", visitors);
251
         result.put("visitors", visitors);
252
         result.put("liked", false);
252
         result.put("liked", false);
253
         result.put("unReadNum", 0);
253
         result.put("unReadNum", 0);
254
         result.put("projects", buildings);
254
         result.put("projects", buildings);
255
-        result.put("address", person.getAddress());
255
+        result.put("address", user.getAddress());
256
         result.put("personTags",person.getPersonTags());
256
         result.put("personTags",person.getPersonTags());
257
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
257
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
258
         result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
258
         result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));