新需求

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

@@ -208,13 +208,13 @@ public class TaPersonController extends BaseController {
         if(StringUtils.isEmpty(channelCode)){
             person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
         }else {
-            person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
+            person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
             queryWrapper.eq("org_id",orgId);
             TaChannel channel = taChannelService.getOne(queryWrapper);
             if (null == channel){
-                return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
+                return ResponseBean.error("验证码有误，请确认后重新输入",ResponseBean.ERROR_UNAVAILABLE);
             }
             QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
             taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());

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

@@ -72,6 +72,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaChannelPersonMapper taChannelPersonMapper;
+
+    @Autowired
+    private TaChannelMapper taChannelMapper;
+
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
@@ -437,6 +443,18 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("personType",taPerson.getPersonType());
         result.put("userId", taPerson.getUserId());
 
+        //经纪人所属渠道
+        QueryWrapper<TaChannelPerson> taChannelPersonQueryWrapper = new QueryWrapper<>();
+        taChannelPersonQueryWrapper.eq("person_id", taPerson.getPersonId());
+        TaChannelPerson taChannelPerson = taChannelPersonMapper.selectOne(taChannelPersonQueryWrapper);
+
+        if (taChannelPerson != null){
+            QueryWrapper<TaChannel> taChannelQueryWrapper = new QueryWrapper<>();
+            taChannelQueryWrapper.eq("channel_id", taChannelPerson.getChannelId());
+            TaChannel taChannel = taChannelMapper.selectOne(taChannelQueryWrapper);
+            result.put("channelName", taChannel.getChannelName());
+        }
+
         return ResponseBean.success(result);
     }