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

pom.xml

 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.4.1</version>
+	<version>v3.4.2</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

     }
     @ApiOperation(value = "微信端查询拼团和助力推首页的活动的", notes = "微信端查询拼团和助力推首页的活动的")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "buildingId", paramType = "query", value = "活动状态"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "1助力，2拼团")
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
-    public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request));
+    public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
+                                               @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                               @RequestParam(value = "type",required = false)Integer type) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
                 return lsit;
         }
 

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

         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            if  (taShareActivity.getGroupBuyPeople() <= 1){
+                responseBean.addError("拼团人数必须大于等于2人");
+                return responseBean;
+            }
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));

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

                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-            IPage<TaShareRecord> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(phone != null,"phone", phone);
-            queryWrapper.eq(groupStatus != null, "status", groupStatus);
-            queryWrapper.eq(groupActivityId != null, "group_activity_id", groupActivityId);
-            queryWrapper.eq(getOrgId(request) != null, "org_id", getOrgId(request));
-
-            IPage<TaShareRecord> result = iTaShareRecordService.page(pg, queryWrapper);
+            IPage<TaShareRecord> result = iTaShareRecordService.getSuccessList(pageNum, pageSize, phone, groupStatus, groupActivityId, getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java

  */
 @Mapper
 public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
-    IPage<TaShareRecord> recordSuccessList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaShareRecord> recordSuccessList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
     IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
     List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
-    List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
     List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId);
 }

src/main/java/com/huiju/estateagents/service/ITaShareRecordService.java

  * @since 2019-10-18
  */
 public interface ITaShareRecordService extends IService<TaShareRecord> {
-    IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
+    IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     IPage<TaShareRecordPO> getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     ResponseBean validateRule(TaShareRecord taShareRecord);
     ResponseBean verifyCode(Integer activityId, String verifyCode);

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

 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.IHelpActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
     @Autowired
     ApplicationContext applicationContext;
 
+    @Autowired
+    TaShareActivityMapper taShareActivityMapper;
+
     @Override
     public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
+        // 根据楼盘id查助力
+        if ("1".equals(type)){
+            QueryWrapper<HelpActivity> helpActivityQuery= new QueryWrapper<>();
+            helpActivityQuery.eq("building_id",buildingId);
+            helpActivityQuery.eq("org_id",orgId);
+            List<HelpActivity> list = taHelpActivityMapper.selectList(helpActivityQuery);
+            responseBean.addSuccess(list);
+            return responseBean;
+        }
+        // 根据楼盘id查拼团
+        if ("2".equals(type)){
+            QueryWrapper<TaShareActivity> taShareActivityQuery= new QueryWrapper<>();
+            taShareActivityQuery.eq("building_id",buildingId);
+            taShareActivityQuery.eq("org_id",orgId);
+            List<TaShareActivity> list = taShareActivityMapper.selectList(taShareActivityQuery);
+            responseBean.addSuccess(list);
+            return responseBean;
+        }
+
         List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
         responseBean.addSuccess(HelpActivity);
         return responseBean;

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

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
 import org.apache.commons.collections.CollectionUtils;
 	@Override
 	public void updateEndActivity(List<Integer> endHelpActivityIds) {
 		if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
-			helpInitiateRecordMapper.updateEndGroupActivity(endHelpActivityIds);
+			List<HelpInitiateRecord> helpInitiateRecords = helpInitiateRecordMapper.selectBatchIds(endHelpActivityIds);
+			for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecords){
+				helpInitiateRecord.setStatus(2);
+				if (helpInitiateRecord.getStatus() != 0){
+					helpInitiateRecordMapper.updateById(helpInitiateRecord);
+				}
+			}
 		}
 	}
 }

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

 		helpRecord.setCreateDate(LocalDateTime.now());
 		helpRecord.setPersonId(person.getPersonId());
 		helpRecordMapper.insert(helpRecord);
-		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
+		if (null == helpInitiateRecord.getEnlistNum()){
+			helpInitiateRecord.setEnlistNum(0);
+		}
+		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
+		if (helpInitiateRecord.getEnlistNum().equals(helpActivity.getPersonNum())){
 			//发送微信模板消息所有人都发送
 			try{
 				sendWxMessage(helpInitiateRecord,orgId,helpActivity);
 			helpInitiateRecord.setSucceedDate(LocalDateTime.now());
 			helpInitiateRecord.setStatus(0);
 		}
-		if (null == helpInitiateRecord.getEnlistNum()){
-			helpInitiateRecord.setEnlistNum(0);
-		}
-		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
+		
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);
 		Map<String,Object> map = new HashMap<>();
 		map.put("helpRecord",helpRecord);

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

         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
-        queryWrapper.orderByDesc("group_activity_id");
+        queryWrapper.orderByAsc("activity_status");
+        queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 
         responseBean.addSuccess(taNewsIPage);
 
     @Override
     public void updateEndActivity(List<Integer> endGroupActivityId) {
+
         if (CollectionUtils.isNotEmpty(endGroupActivityId)){
             taShareActivityMapper.updateEndGroupActivity(endGroupActivityId);
         }

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

     @Override
     public void updateEndActivity(List<Integer> endGroupActivityIds) {
         if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
-            taShareChildRecordMapper.updateEndGroupActivity(endGroupActivityIds);
+            List<TaShareChildRecord> taShareChildRecords = taShareChildRecordMapper.selectBatchIds(endGroupActivityIds);
+            for (TaShareChildRecord taShareChildRecord : taShareChildRecords){
+                taShareChildRecord.setStatus(2);
+                if (taShareChildRecord.getStatus() != 0){
+                    taShareChildRecordMapper.updateById(taShareChildRecord);
+                }
+            }
         }
     }
 
             taShareRecord.setVerificationCode(String.valueOf(taShareRecord.getRecordId()+System.currentTimeMillis()));
             taShareRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
             taShareRecord.setStatus(CommConstant.STATUS_UNACCALIMED);
+            taShareRecord.setEndTime(LocalDateTime.now());
         }
         tashareRecordmapper.updateById(taShareRecord);
         Map<String,Object> map = new HashMap<>();
      * @param groupActivityId
      */
     private void changeChildRecord(Integer recordId, Integer orgId, Integer groupActivityId) {
+        LocalDateTime dateTime = LocalDateTime.now();
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
         taShareChildRecordQueryWrapper.eq("record_id",recordId);
         taShareChildRecordQueryWrapper.eq("org_id",orgId);
             e.setVerificationCode(String.valueOf(e.getChildRecordId()+System.currentTimeMillis()));
             e.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
             e.setStatus(CommConstant.STATUS_UNACCALIMED);
+            e.setEndTime(dateTime);
         });
         this.updateBatchById(shareChildRecordList);
     }

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

     private TaShareChildRecordMapper taShareChildRecordMapper;
 
     @Override
-    public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
+    public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
         IPage<TaShareRecord> page = new Page<>(pageNum,pageSize);
-        return taShareRecordMapper.recordSuccessList(page, phone, status, orgId);
+        return taShareRecordMapper.recordSuccessList(page, phone, status, groupActivityId, orgId);
     }
 
     @Override
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("verification_code", verifyCode);
-        queryWrapper.eq("group_activity_id", activityId);
+        queryWrapper.eq(activityId!=null, "group_activity_id", activityId);
         TaShareRecord taShareRecord = taShareRecordMapper.selectOne(queryWrapper);
 
         QueryWrapper<TaShareChildRecord> wrapper = new QueryWrapper<>();
         wrapper.eq("verification_code", verifyCode);
-        wrapper.eq("group_activity_id", activityId);
+        wrapper.eq(activityId!=null, "group_activity_id", activityId);
         TaShareChildRecord taShareChildRecord = taShareChildRecordMapper.selectOne(wrapper);
 
         if (taShareRecord == null && taShareChildRecord == null){
     @Override
     public void updateEndActivity(List<Integer> endGroupActivityIds) {
         if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
-            taShareRecordMapper.updateEndGroupActivity(endGroupActivityIds);
+            List<TaShareRecord> taShareRecords = taShareRecordMapper.selectBatchIds(endGroupActivityIds);
+            for (TaShareRecord taShareRecord : taShareRecords){
+                taShareRecord.setStatus(2);
+                if (taShareRecord.getStatus() != 0){
+                    taShareRecordMapper.updateById(taShareRecord);
+                }
+            }
         }
     }
 
     
         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){

src/main/resources/mapper/TaShareRecordMapper.xml

 
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         (select
+        t.group_activity_id as groupActivityId,
         t.nickname,
         t.phone,
         t.create_time,
         <if test="status !=null and status != ''">
             and t.status = #{status}
         </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_activity_id = #{groupActivityId}
+        </if>
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
         </if> order by t.end_time desc limit 100000000)
         union all
         (select
+        a.group_activity_id as groupActivityId,
         a.nickname as joinNickName,
         a.phone as joinPhone,
         a.create_time as joinCreateTime,
         <if test="status !=null and status != ''">
             and a.status = #{status}
         </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and a.group_activity_id = #{groupActivityId}
+        </if>
         <if test="orgId != null and orgId != ''">
             and a.org_id = #{orgId}
         </if>
         t.phone,
         t.create_time,
         a.group_buy_people,
+        t.join_people,
         t.status,
         t.verification_status,
         t.verification_code