bugfix

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

@@ -146,6 +146,7 @@ public class TaPersonController extends BaseController {
             channelPerson.setChannelId(channel.getChannelId());
             channelPerson.setPersonId(person.getPersonId());
             channelPerson.setCreateDate(LocalDateTime.now());
+            channelPerson.setStatus(CommConstant.STATUS_NORMAL);
             taChannelPersonService.save(channelPerson);
         }
         taPersonService.updateById(person);
@@ -436,6 +437,61 @@ public class TaPersonController extends BaseController {
 //        }
 //
 //    }
+    /**
+     * 变更经纪人类型
+     * @param channelCode 渠道码
+     * @return
+     */
+    @RequestMapping(value="/wx/customer/recommend/beComeChannel/{channelCode}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendAgentBecomeChannel(@PathVariable String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
+        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);
+        try {
+            if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
+                QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
+                channelQueryWrapper.eq("channel_code",channelCode);
+                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+                TaChannel channel = taChannelService.getOne(channelQueryWrapper);
+                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                channelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
+                Integer count = taChannelPersonService.count(channelPersonQueryWrapper);
+                if(count >0){
+                    return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
+                }
+                TaChannelPerson channelPerson = new TaChannelPerson();
+                channelPerson.setCreateDate(LocalDateTime.now());
+                channelPerson.setPersonId(person.getPersonId());
+                channelPerson.setChannelId(channel.getChannelId());
+                channelPerson.setStatus(CommConstant.STATUS_NORMAL);
+                taChannelPersonService.save(channelPerson);
+            }else {
+                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
+                if (taChannelPerson.size()>0){
+                    for(int i=0;i<taChannelPerson.size();i++){
+                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
+                    }
+                    taChannelPersonService.updateBatchById(taChannelPerson);
+                }
+            }
+            person.setPersonType(personType);
+            if (taPersonService.updateById(person)){
+                responseBean.addSuccess(person);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
 
 

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

@@ -329,60 +329,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
-    /**
-     * 修改对象
-     * @param channelCode 渠道码
-     * @return
-     */
-    @RequestMapping(value="/wx/customer/recommend/beComeChannel/{channelCode}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendAgentBecomeChannel(@PathVariable String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
-        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);
-        try {
-            if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
-                QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
-                channelQueryWrapper.eq("channel_code",channelCode);
-                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
-                TaChannel channel = taChannelService.getOne(channelQueryWrapper);
-                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
-                channelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
-                Integer count = taChannelPersonService.count(channelPersonQueryWrapper);
-                if(count >0){
-                    return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
-                }
-                TaChannelPerson channelPerson = new TaChannelPerson();
-                channelPerson.setCreateDate(LocalDateTime.now());
-                channelPerson.setPersonId(person.getPersonId());
-                channelPerson.setChannelId(channel.getChannelId());
-                taChannelPersonService.save(channelPerson);
-            }else {
-                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
-                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
-                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
-                if (taChannelPerson.size()>0){
-                    for(int i=0;i<taChannelPerson.size();i++){
-                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
-                    }
-                    taChannelPersonService.updateBatchById(taChannelPerson);
-                }
-            }
-            person.setPersonType(personType);
-            if (taPersonService.updateById(person)){
-                responseBean.addSuccess(person);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
+
 
         /**
      * 修改对象