傅行帆 5 年前
父节点
当前提交
a3911118a3

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java 查看文件

414
             helpInitiateRecordQueryWrapper.eq("org_id",orgId);
414
             helpInitiateRecordQueryWrapper.eq("org_id",orgId);
415
             helpInitiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
415
             helpInitiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
416
             helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
416
             helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
417
+            //已经成功的助力
417
             List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
418
             List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
418
             helpActivity.setSuccessNum(helpInitiateRecordList.size());
419
             helpActivity.setSuccessNum(helpInitiateRecordList.size());
419
             map.put("helpActivity",helpActivity);
420
             map.put("helpActivity",helpActivity);

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java 查看文件

292
             shareRecordQueryWrapper.eq("org_id",orgId);
292
             shareRecordQueryWrapper.eq("org_id",orgId);
293
             shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
293
             shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
294
             shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
294
             shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
295
+            //已经成功的拼团
295
             List<TaShareRecord> taShareRecordsList = taShareRecordService.list(shareRecordQueryWrapper);
296
             List<TaShareRecord> taShareRecordsList = taShareRecordService.list(shareRecordQueryWrapper);
296
             taShareActivity.setSuccessNum(taShareRecordsList.size());
297
             taShareActivity.setSuccessNum(taShareRecordsList.size());
297
             map.put("taShareActivity",taShareActivity);
298
             map.put("taShareActivity",taShareActivity);

+ 3
- 0
src/main/java/com/huiju/estateagents/entity/TdPosterTemplate.java 查看文件

1
 package com.huiju.estateagents.entity;
1
 package com.huiju.estateagents.entity;
2
 
2
 
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
3
 import com.baomidou.mybatisplus.annotation.TableName;
5
 import com.baomidou.mybatisplus.annotation.TableName;
4
 import lombok.Data;
6
 import lombok.Data;
5
 import lombok.EqualsAndHashCode;
7
 import lombok.EqualsAndHashCode;
27
     /**
29
     /**
28
      * 编号
30
      * 编号
29
      */
31
      */
32
+    @TableId(value = "template_id",type = IdType.AUTO)
30
     private Integer templateId;
33
     private Integer templateId;
31
 
34
 
32
     /**
35
     /**

+ 11
- 4
src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java 查看文件

109
 		helpRecordMapper.insert(helpRecord);
109
 		helpRecordMapper.insert(helpRecord);
110
 		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
110
 		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
111
 			//发送微信模板消息所有人都发送
111
 			//发送微信模板消息所有人都发送
112
-			sendWxMessage(helpInitiateRecord,orgId,helpActivity);
112
+			try{
113
+				sendWxMessage(helpInitiateRecord,orgId,helpActivity);
114
+			}catch (Exception e){}
113
 			
115
 			
114
 			//生成核销码
116
 			//生成核销码
115
 			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
117
 			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
134
 	 * @param helpActivity
136
 	 * @param helpActivity
135
 	 */
137
 	 */
136
 	private void sendWxMessage(HelpInitiateRecord helpInitiateRecord, Integer orgId, HelpActivity helpActivity) {
138
 	private void sendWxMessage(HelpInitiateRecord helpInitiateRecord, Integer orgId, HelpActivity helpActivity) {
139
+		String link = "/pages/activity/detail/assistance?id="+helpInitiateRecord.getHelpActivityId()+"&initiateId="+helpInitiateRecord.getHelpRecordInitiateId();
137
 		//发送给发起者
140
 		//发送给发起者
138
 		TaPerson taPerson = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
141
 		TaPerson taPerson = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
139
-		String link = "/pages/activity/detail/assistance?id="+helpInitiateRecord.getHelpActivityId()+"&initiateId="+helpInitiateRecord.getHelpRecordInitiateId();
140
-		miniAppService.sendHelpMessage(taPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
142
+		if (null != taPerson){
143
+			miniAppService.sendHelpMessage(taPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
144
+		}
145
+		
141
 		//批量发送给助力者
146
 		//批量发送给助力者
142
 		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
147
 		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
143
 		queryWrapper.eq("org_id",orgId);
148
 		queryWrapper.eq("org_id",orgId);
146
 		List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
151
 		List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
147
 		helpRecords.forEach(e -> {
152
 		helpRecords.forEach(e -> {
148
 			TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
153
 			TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
149
-			miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
154
+			if (null != taPerson){
155
+				miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
156
+			}
150
 		});
157
 		});
151
 	}
158
 	}
152
 	
159
 	

+ 15
- 7
src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java 查看文件

164
         taShareChildRecordMapper.insert(taShareChildRecord);
164
         taShareChildRecordMapper.insert(taShareChildRecord);
165
         if (taShareRecord.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
165
         if (taShareRecord.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
166
             //发送微信模板消息所有人都发送
166
             //发送微信模板消息所有人都发送
167
-            sendWxMessage(taShareRecord,orgId,taShareActivity);
167
+            try{
168
+                sendWxMessage(taShareRecord,orgId,taShareActivity);
169
+            }catch (Exception e){}
168
             
170
             
169
             //生成团员核销码和改状态拼团成功
171
             //生成团员核销码和改状态拼团成功
170
             changeChildRecord(taShareChildRecord.getRecordId(),orgId,taShareChildRecord.getGroupActivityId());
172
             changeChildRecord(taShareChildRecord.getRecordId(),orgId,taShareChildRecord.getGroupActivityId());
171
             //生成团长核销码和拼团成功
173
             //生成团长核销码和拼团成功
172
             taShareRecord.setVerificationCode(String.valueOf(taShareRecord.getRecordId()+System.currentTimeMillis()));
174
             taShareRecord.setVerificationCode(String.valueOf(taShareRecord.getRecordId()+System.currentTimeMillis()));
173
             taShareRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
175
             taShareRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
176
+            taShareRecord.setStatus(CommConstant.STATUS_UNACCALIMED);
174
         }
177
         }
175
         tashareRecordmapper.updateById(taShareRecord);
178
         tashareRecordmapper.updateById(taShareRecord);
176
         Map<String,Object> map = new HashMap<>();
179
         Map<String,Object> map = new HashMap<>();
177
-        map.put("taShareChildRecord",taShareChildRecord);
180
+        map.put("taShareChildRecord",taShareChildRecordMapper.selectById(taShareChildRecord.getChildRecordId()));
178
         map.put("taShareRecord",taShareRecord);
181
         map.put("taShareRecord",taShareRecord);
179
         return ResponseBean.success(map);
182
         return ResponseBean.success(map);
180
     }
183
     }
186
      * @param taShareActivity
189
      * @param taShareActivity
187
      */
190
      */
188
     private void sendWxMessage(TaShareRecord taShareRecord, Integer orgId, TaShareActivity taShareActivity) {
191
     private void sendWxMessage(TaShareRecord taShareRecord, Integer orgId, TaShareActivity taShareActivity) {
192
+        String link = "/pages/activity/detail/assemble?id="+taShareRecord.getGroupActivityId()+"&recordId="+taShareRecord.getRecordId();
189
         //发送给发起者
193
         //发送给发起者
190
-        TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getRecordId());
191
-        //--todo
192
-        String link = "/pages/activity/detail/assistance?id="+taShareRecord.getGroupActivityId()+"&initiateId="+taShareRecord.getRecordId();
193
-        miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
194
+        TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
195
+        if (null != taPerson){
196
+            miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
197
+        }
198
+        
194
         //批量发送给助力者
199
         //批量发送给助力者
195
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
200
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
196
         taShareChildRecordQueryWrapper.eq("org_id",orgId);
201
         taShareChildRecordQueryWrapper.eq("org_id",orgId);
199
         List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
204
         List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
200
         shareChildRecordList.forEach(e -> {
205
         shareChildRecordList.forEach(e -> {
201
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
206
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
202
-            miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
207
+            if (null != toTaPerson){
208
+                miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
209
+            }
203
         });
210
         });
204
     }
211
     }
205
     
212
     
218
         shareChildRecordList.forEach(e -> {
225
         shareChildRecordList.forEach(e -> {
219
             e.setVerificationCode(String.valueOf(e.getChildRecordId()+System.currentTimeMillis()));
226
             e.setVerificationCode(String.valueOf(e.getChildRecordId()+System.currentTimeMillis()));
220
             e.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
227
             e.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
228
+            e.setStatus(CommConstant.STATUS_UNACCALIMED);
221
         });
229
         });
222
         this.updateBatchById(shareChildRecordList);
230
         this.updateBatchById(shareChildRecordList);
223
     }
231
     }