activity

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

@@ -414,6 +414,7 @@ public class HelpActivityController extends BaseController {
             helpInitiateRecordQueryWrapper.eq("org_id",orgId);
             helpInitiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
             helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            //已经成功的助力
             List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
             helpActivity.setSuccessNum(helpInitiateRecordList.size());
             map.put("helpActivity",helpActivity);

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

@@ -292,6 +292,7 @@ public class TaShareActivityController extends BaseController {
             shareRecordQueryWrapper.eq("org_id",orgId);
             shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
             shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            //已经成功的拼团
             List<TaShareRecord> taShareRecordsList = taShareRecordService.list(shareRecordQueryWrapper);
             taShareActivity.setSuccessNum(taShareRecordsList.size());
             map.put("taShareActivity",taShareActivity);

src/main/java/com/huiju/estateagents/entity/TdPosterTemplate.java

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,7 @@ public class TdPosterTemplate implements Serializable {
     /**
      * 编号
      */
+    @TableId(value = "template_id",type = IdType.AUTO)
     private Integer templateId;
 
     /**

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

@@ -109,7 +109,9 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		helpRecordMapper.insert(helpRecord);
 		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
 			//发送微信模板消息所有人都发送
-			sendWxMessage(helpInitiateRecord,orgId,helpActivity);
+			try{
+				sendWxMessage(helpInitiateRecord,orgId,helpActivity);
+			}catch (Exception e){}
 			
 			//生成核销码
 			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
@@ -134,10 +136,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 	 * @param helpActivity
 	 */
 	private void sendWxMessage(HelpInitiateRecord helpInitiateRecord, Integer orgId, HelpActivity helpActivity) {
+		String link = "/pages/activity/detail/assistance?id="+helpInitiateRecord.getHelpActivityId()+"&initiateId="+helpInitiateRecord.getHelpRecordInitiateId();
 		//发送给发起者
 		TaPerson taPerson = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
-		String link = "/pages/activity/detail/assistance?id="+helpInitiateRecord.getHelpActivityId()+"&initiateId="+helpInitiateRecord.getHelpRecordInitiateId();
-		miniAppService.sendHelpMessage(taPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+		if (null != taPerson){
+			miniAppService.sendHelpMessage(taPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+		}
+		
 		//批量发送给助力者
 		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_id",orgId);
@@ -146,7 +151,9 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
 		helpRecords.forEach(e -> {
 			TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
-			miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+			if (null != taPerson){
+				miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+			}
 		});
 	}
 	

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

@@ -164,17 +164,20 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         taShareChildRecordMapper.insert(taShareChildRecord);
         if (taShareRecord.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
             //发送微信模板消息所有人都发送
-            sendWxMessage(taShareRecord,orgId,taShareActivity);
+            try{
+                sendWxMessage(taShareRecord,orgId,taShareActivity);
+            }catch (Exception e){}
             
             //生成团员核销码和改状态拼团成功
             changeChildRecord(taShareChildRecord.getRecordId(),orgId,taShareChildRecord.getGroupActivityId());
             //生成团长核销码和拼团成功
             taShareRecord.setVerificationCode(String.valueOf(taShareRecord.getRecordId()+System.currentTimeMillis()));
             taShareRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
+            taShareRecord.setStatus(CommConstant.STATUS_UNACCALIMED);
         }
         tashareRecordmapper.updateById(taShareRecord);
         Map<String,Object> map = new HashMap<>();
-        map.put("taShareChildRecord",taShareChildRecord);
+        map.put("taShareChildRecord",taShareChildRecordMapper.selectById(taShareChildRecord.getChildRecordId()));
         map.put("taShareRecord",taShareRecord);
         return ResponseBean.success(map);
     }
@@ -186,11 +189,13 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
      * @param taShareActivity
      */
     private void sendWxMessage(TaShareRecord taShareRecord, Integer orgId, TaShareActivity taShareActivity) {
+        String link = "/pages/activity/detail/assemble?id="+taShareRecord.getGroupActivityId()+"&recordId="+taShareRecord.getRecordId();
         //发送给发起者
-        TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getRecordId());
-        //--todo
-        String link = "/pages/activity/detail/assistance?id="+taShareRecord.getGroupActivityId()+"&initiateId="+taShareRecord.getRecordId();
-        miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+        TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
+        if (null != taPerson){
+            miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+        }
+        
         //批量发送给助力者
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
         taShareChildRecordQueryWrapper.eq("org_id",orgId);
@@ -199,7 +204,9 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
         shareChildRecordList.forEach(e -> {
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
-            miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+            if (null != toTaPerson){
+                miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+            }
         });
     }
     
@@ -218,6 +225,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         shareChildRecordList.forEach(e -> {
             e.setVerificationCode(String.valueOf(e.getChildRecordId()+System.currentTimeMillis()));
             e.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
+            e.setStatus(CommConstant.STATUS_UNACCALIMED);
         });
         this.updateBatchById(shareChildRecordList);
     }