Merge remote-tracking branch 'origin/v3.5' into v3.5

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

@@ -400,11 +400,13 @@ public class TaBuildingDynamicController extends BaseController {
         dynamic.setOrgId(getOrgId(request));
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
-        //发布状态
-        dynamic.setStatus(0);
-        //活动状态
+        //发布状态 1展示
+        dynamic.setStatus(1);
+        //活动状态，如果不需要报名则直接置为进行中
         dynamic.setActivityStatus(1);
-//        dynamic.setDynamicId(idGen.nextId()+"");
+        if (dynamic.getIsEnlist() == 0){
+            dynamic.setActivityStatus(0);
+        }
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
 
@@ -433,6 +435,15 @@ public class TaBuildingDynamicController extends BaseController {
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
+        if (dynamic.getIsEnlist() == 0 || (LocalDateTime.now().isAfter(dynamic.getEnlistStart()) && LocalDateTime.now().isBefore(dynamic.getEnlistEnd()))){
+            dynamic.setActivityStatus(0);
+        }
+        if (dynamic.getEnlistStart() != null && LocalDateTime.now().isBefore(dynamic.getEnlistStart())){
+            dynamic.setActivityStatus(1);
+        }
+        if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
+            dynamic.setActivityStatus(2);
+        }
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;

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

@@ -56,6 +56,7 @@ public class TaEventPropertiesController extends BaseController {
             QueryWrapper<TaEventProperties> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(eventType), "event_type", eventType);
             queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+            queryWrapper.groupBy("event_type");
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaEventProperties> result = iTaEventPropertiesService.page(pg, queryWrapper);

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

@@ -70,7 +70,7 @@ public class TaShareActivityController extends BaseController {
     
     @Autowired
     private ITdPosterTemplateService tdPosterTemplateService;
-    
+
 
     /**
      * 分页查询列表
@@ -259,6 +259,8 @@ public class TaShareActivityController extends BaseController {
             //0：进行中 1：未开始 2：已结束
             taShareActivity.setActivityStatus(2);
             taShareActivity.setGroupActivityId(id);
+            taShareRecordService.updateActivityProcessToEndByGroupActivityId(id);
+            taShareChildRecordService.updateActivityProcessToEndByGroupActivityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {

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

@@ -22,4 +22,5 @@ public interface TaShareChildRecordMapper extends BaseMapper<TaShareChildRecord>
     IPage<TaShareChildRecord> getList(IPage<TaShareChildRecord> pg, @Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("recordId") Integer recordId, @Param("orgId") Integer orgId);
     List<ShareChildRecordExport> getShareRecordExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     void updateEndGroupActivity();
+    void updateActivityProcessToEndByGroupActivityId(@Param("groupActivityId") Integer groupActivityId);
 }

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

@@ -29,7 +29,7 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     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> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
     void updateEndGroupActivity();
-
+    void updateEndGroupActivityByGroupActivityId(@Param("groupActivityId")Integer groupActivityId);
     /**
      * 计算成团数
      * @param groupActivityId

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

@@ -23,6 +23,13 @@ public interface ITaShareChildRecordService extends IService<TaShareChildRecord>
     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
 	void updateActivityProcessToEnd();
+
+	/**
+	 * 根据拼团活动id更新参团者拼团失败
+	 * @param groupActivityId
+	 */
+	void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId);
+
 	/**
 	 * 微信端成为团员
 	 *

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

@@ -30,6 +30,12 @@ public interface ITaShareRecordService extends IService<TaShareRecord> {
     List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
     List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
 	void updateActivityProcessToEnd();
+
+	/**
+	 * 根据拼团活动id更新发团者拼团失败
+	 */
+	void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId);
+
     /**
 	 * 分页获取微信端发起拼团记录
 	 * @param pageNum

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

@@ -115,6 +115,11 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         taShareChildRecordMapper.updateEndGroupActivity();
     }
 
+    @Override
+    public void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId) {
+        taShareChildRecordMapper.updateActivityProcessToEndByGroupActivityId(groupActivityId);
+    }
+
     /**
      * 微信端成为团员
      *

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

@@ -162,6 +162,11 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         taShareRecordMapper.updateEndGroupActivity();
     }
 
+    @Override
+    public void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId) {
+        taShareRecordMapper.updateEndGroupActivityByGroupActivityId(groupActivityId);
+    }
+
     /**
      * 分页获取微信端发起拼团记录
      *

src/main/resources/mapper/HelpActivityMapper.xml

@@ -69,7 +69,7 @@
 				ta_help_activity a
 				WHERE
                     a.org_id =#{orgId}
-                <if test="buildingId  == null ">
+                <if test="buildingId  == null or  buildingId ==''">
                   and  a.is_main = 1
                 </if>
                 <if test="cityID != null and cityID != ''">
@@ -90,7 +90,7 @@
 					ta_share_activity s
 					WHERE
                     s.org_id =#{orgId}
-                <if test="buildingId  == null ">
+                <if test="buildingId  == null or  buildingId =='' ">
                     and  s.sort = 1
                 </if>
                 <if test="cityID != null and cityID != ''">

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -9,6 +9,12 @@
         where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
+    <update id="updateActivityProcessToEndByGroupActivityId">
+      <if test="groupActivityId != null and groupActivityId != ''">
+          update ta_share_child_record a set a.status = '2' where a.group_activity_id = #{groupActivityId}
+      </if>
+    </update>
+
     <select id="getList" resultType="com.huiju.estateagents.entity.TaShareChildRecord">
         select
           t.nickname,

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -9,6 +9,12 @@
         where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
+    <update id="updateEndGroupActivityByGroupActivityId">
+        <if test="groupActivityId != '' and groupActivityId != null">
+            update ta_share_record a set a.status = '2' where a.group_activity_id = #{groupActivityId}
+        </if>
+    </update>
+
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         (select
         t.record_id,