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

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

@@ -580,7 +580,6 @@ public class TaBuildingDynamicController extends BaseController {
         if ("1".equals(top)) {
             dynamic.setCreateDate(LocalDateTime.now());
         } else {
-            dynamic.setIsEnlist(0);
             dynamic.setActivityStatus(2);
         }
         iBuildingDynamicService.update(dynamic, taBuildingDynamic);

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

@@ -50,6 +50,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
 		tdPointsRulesQueryWrapper.eq("code",code);
 		tdPointsRulesQueryWrapper.eq("org_id",orgId);
+		tdPointsRulesQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
 		TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
 		if (null == rule) {
 			return 0;

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

@@ -214,7 +214,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         //发送给发起者
         TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
         if (null != taPerson){
-            miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+            miniAppService.sendHelpMessage(taPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
         }
         
         //批量发送给助力者
@@ -226,7 +226,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         shareChildRecordList.forEach(e -> {
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
             if (null != toTaPerson){
-                miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+                miniAppService.sendHelpMessage(toTaPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
             }
         });
     }