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

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

@@ -308,6 +308,7 @@ public class TaBuildingDynamicController extends BaseController {
                enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
                    if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
+                       enlist.setEnlistId(Integer.valueOf(enlistId));
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
                        Integer rulePoints = taPointsRecordsService.getRulePoints(CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN, getOrgId(request));
                        enlist.setAddPoints(rulePoints);

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

@@ -165,6 +165,7 @@ public class TaPersonController extends BaseController {
             person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
             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);
@@ -541,6 +542,12 @@ public class TaPersonController extends BaseController {
     @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
     public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
         ResponseBean responseBean = new ResponseBean();
+
+        if (org.apache.commons.lang3.StringUtils.isBlank(personType)) {
+            responseBean.addSuccess("personType为空");
+            return responseBean;
+        }
+
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -551,6 +558,7 @@ public class TaPersonController extends BaseController {
             if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
                 QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
                 channelQueryWrapper.eq("channel_code",channelCode);
+                channelQueryWrapper.eq("org_id",getOrgId(request));
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
                 List<TaChannel> channel = taChannelService.list(channelQueryWrapper);
                 if(channel.size()>0){

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

@@ -171,6 +171,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("user="+taActivityDynamicEnlist.getPersonId());
+			add("targetId="+taActivityDynamicEnlist.getEnlistId().toString());
 		}};
 		String changeParams = String.join("&", params);
 		boolean hasJoined = isPointsRecordsExist(taActivityDynamicEnlist.getPersonId(), changeType, changeParams);