Quellcode durchsuchen

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

魏熙美 vor 5 Jahren
Ursprung
Commit
e6526051b7

+ 0
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Datei anzeigen

580
         if ("1".equals(top)) {
580
         if ("1".equals(top)) {
581
             dynamic.setCreateDate(LocalDateTime.now());
581
             dynamic.setCreateDate(LocalDateTime.now());
582
         } else {
582
         } else {
583
-            dynamic.setIsEnlist(0);
584
             dynamic.setActivityStatus(2);
583
             dynamic.setActivityStatus(2);
585
         }
584
         }
586
         iBuildingDynamicService.update(dynamic, taBuildingDynamic);
585
         iBuildingDynamicService.update(dynamic, taBuildingDynamic);

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPointsRecordsServiceImpl.java Datei anzeigen

50
 		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
50
 		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
51
 		tdPointsRulesQueryWrapper.eq("code",code);
51
 		tdPointsRulesQueryWrapper.eq("code",code);
52
 		tdPointsRulesQueryWrapper.eq("org_id",orgId);
52
 		tdPointsRulesQueryWrapper.eq("org_id",orgId);
53
+		tdPointsRulesQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
53
 		TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
54
 		TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
54
 		if (null == rule) {
55
 		if (null == rule) {
55
 			return 0;
56
 			return 0;

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java Datei anzeigen

214
         //发送给发起者
214
         //发送给发起者
215
         TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
215
         TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
216
         if (null != taPerson){
216
         if (null != taPerson){
217
-            miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
217
+            miniAppService.sendHelpMessage(taPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
218
         }
218
         }
219
         
219
         
220
         //批量发送给助力者
220
         //批量发送给助力者
226
         shareChildRecordList.forEach(e -> {
226
         shareChildRecordList.forEach(e -> {
227
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
227
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
228
             if (null != toTaPerson){
228
             if (null != toTaPerson){
229
-                miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
229
+                miniAppService.sendHelpMessage(toTaPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
230
             }
230
             }
231
         });
231
         });
232
     }
232
     }