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

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

 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.IHelpActivityService;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
     
     @Autowired
     private ITaPersonService taPersonService;
-
-
+    
+    @Autowired
+    public IHelpRecordService helpRecordService;
+    
+    @Autowired
+    public IHelpActivityService taHelpActivityService;
+    
     /**
      * 分页查询列表
      * @param pageNum
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        HelpActivity helpActivity = taHelpActivityService.getById(helpInitiateRecord.getHelpActivityId());
+        if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         try {
  
             //查看是否发起过助力
             helpInitiateRecordQueryWrapper.ne("status",-1);
             HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
             if (null != recordServiceOne){
-                responseBean.addSuccess(recordServiceOne);
+                map.put("helpInitiateRecord",recordServiceOne);
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_record_initiate_id",recordServiceOne.getHelpRecordInitiateId());
+                List<HelpRecord> list = helpRecordService.list(helpRecordQueryWrapper);
+                map.put("helpRecordList",list);
+                responseBean.addSuccess(map);
                 return responseBean;
             }
  
             helpInitiateRecord.setOrgId(orgId);
             helpInitiateRecord.setStatus(1);
             if (taHelpInitiateRecordService.save(helpInitiateRecord)){
-                responseBean.addSuccess(helpInitiateRecord);
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",new ArrayList<>());
+                responseBean.addSuccess(map);
             }else {
                 responseBean.addError("fail");
             }

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

             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {
-            responseBean.addError("该置业顾问不存在。");
+            responseBean.addError("此手机号未录入到后台系统，请联系营销云管理员。");
         }
         return responseBean;
     }

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

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
      */
     @Override
     public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
+        Map<String,Object> map = new HashMap<>();
         TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
-    
+        if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(taShareActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taShareRecord.getPersonId());
         queryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
         TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
     
         if (record != null){
-            return ResponseBean.error("您已经发起拼团，请勿再次发起，加入好友的拼团吧",ResponseBean.ERROR_UNAVAILABLE);
+            map.put("record",record);
+            QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
+            taShareChildRecordQueryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
+            taShareChildRecordQueryWrapper.eq("org_id",orgId);
+            taShareChildRecordQueryWrapper.eq("record_id",record.getRecordId());
+            List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
+            map.put("shareChildRecordList",shareChildRecordList);
+            return ResponseBean.success(map);
         }
         if (null == taShareActivity.getIntegral()){
             taShareActivity.setIntegral(0);
         taShareRecord.setCreateTime(LocalDateTime.now());
         taShareRecord.setStatus(1);
         taShareRecordMapper.insert(taShareRecord);
-        return ResponseBean.success(taShareRecord);
+        map.put("record",taShareRecord);
+        map.put("shareChildRecordList",new ArrayList<>());
+        return ResponseBean.success(map);
     }
 }