register

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -23,6 +23,11 @@ public class CommConstant {
      */
     public final static String PERSON_ESTATE_CUSTOMER = "customer";
 
+    /**
+     * 人员类型: 客户
+     */
+    public final static String PERSON_ESTATE_CHANNEL = "channel agent";
+
     /**
      * 人员类型: 游客
      */

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

@@ -12,11 +12,8 @@ import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaShareMapper;
-import com.huiju.estateagents.service.IMiniAppService;
-import com.huiju.estateagents.service.ITaCustomerPersonService;
-import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -54,6 +51,9 @@ public class MiniAppController {
     @Autowired
     private TaShareMapper taShareMapper;
 
+    @Autowired
+    private ITaOrgService taOrgService;
+
 
 
     /**
@@ -114,7 +114,12 @@ public class MiniAppController {
 
             // 获取其余信息
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
-
+            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
+                QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
+                orgQueryWrapper.eq("org_id",taPerson.getOrgId());
+                TaOrg org = taOrgService.getOne(orgQueryWrapper);
+                taPerson.setOrg(org);
+            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
             result.put("person", taPerson);

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

@@ -2,20 +2,27 @@ package com.huiju.estateagents.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import org.checkerframework.checker.units.qual.A;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -34,6 +41,12 @@ import java.util.Map;
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
+    @Autowired
+    TaChannelService taChannelService;
+    @Autowired
+    TaChannelPersonService taChannelPersonService;
+    @Autowired
+    ITaUserService taUserService;
 
     /**
      *
@@ -74,10 +87,66 @@ public class TaPersonController extends BaseController {
 
     }
 
-    @PutMapping("/wx/registerAgent/{id}")
-    public ResponseBean registerAgent(@PathVariable String recommendAgentCode, @PathVariable String channelCode) {
+    @PutMapping("/wx/registerConsultant")
+    public ResponseBean registerConsultant(@RequestParam Integer orgId,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("org_id",orgId);
+        List<TaUser> users = taUserService.list(queryWrapper);
+        if(users.size()>0){
+            TaUser user = users.get(0);
+            person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
+            person.setUserId(user.getUserId());
+            person.setAvatarurl(user.getAvatar());
+            taPersonService.updateById(person);
+            responseBean.addSuccess(person);
+        }else {
+            responseBean.addError("您不是置业顾问。");
+        }
+        return responseBean;
+    }
 
+    @PutMapping("/wx/registerAgent")
+    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,@RequestParam Integer orgId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        person.setAgentCode(taPersonService.agentCodeGenerator());
+        if (!StringUtils.isEmpty(recommendAgentCode)){
+            QueryWrapper<TaPerson> agentWrapper = new QueryWrapper();
+            agentWrapper.eq("agent_code",recommendAgentCode);
+            agentWrapper.eq("org_id",orgId);
+            TaPerson agent = taPersonService.getOne(agentWrapper);
+            if (null != agent){
+                person.setRecommendAgent(agent.getPersonId());
+            }
+        }
+        if(StringUtils.isEmpty(channelCode)){
+            person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
+        }else {
+            person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
+            QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("channel_code",channelCode);
+            TaChannel channel = taChannelService.getOne(queryWrapper);
+            TaChannelPerson channelPerson = new TaChannelPerson();
+            channelPerson.setChannelId(channel.getChannelId());
+            channelPerson.setPersonId(person.getPersonId());
+            channelPerson.setCreateDate(LocalDateTime.now());
+            taChannelPersonService.save(channelPerson);
+        }
+        taPersonService.updateById(person);
+        responseBean.addSuccess(person);
 
         return responseBean;
     }

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

@@ -228,12 +228,19 @@ public class TaPerson implements Serializable {
 
     private String fromCode;
 
+    private String orgId;
+
     private Integer userId;
 
     private String userPort;
 
     private String agentCode;
 
+    private String recommendAgent;
+
     @TableField(exist = false)
     private Integer isSave;
+
+    @TableField(exist = false)
+    private TaOrg org;
 }