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

src/main/java/com/huiju/estateagents/activity/entity/Activity.java

@@ -29,4 +29,9 @@ public class Activity {
 	private Integer activityStatus;
 	
 	private String type;
+	
+	/**
+	 * 完成数量
+	 */
+	private Integer successNum;
 }

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -75,18 +75,33 @@ public class ActivityServiceImpl implements ActivityServiceI {
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}
 				});
+				e.setSuccessNum(null);
 			}else if (e.getType().equals("share")){
 				taShareRecords.forEach(share -> {
 					if (e.getId().equals(share.getGroupActivityId())){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}
 				});
+				//查看此活动已经完成的数量
+				QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
+				shareRecordQueryWrapper.eq("org_id",orgId);
+				shareRecordQueryWrapper.eq("group_activity_id",e.getId());
+				shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+				List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
+				e.setSuccessNum(taShareRecordsList.size());
 			}else if (e.getType().equals("help")){
 				helpRecords.forEach(help -> {
 					if (e.getId().equals(help.getHelpActivityId())){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}
 				});
+				//查看此活动已经完成的数量
+				QueryWrapper<HelpRecord> tahelpRecordQueryWrapper = new QueryWrapper<>();
+				tahelpRecordQueryWrapper.eq("org_id",orgId);
+				tahelpRecordQueryWrapper.eq("help_activity_id",e.getId());
+				tahelpRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+				List<HelpRecord> helpRecordList = helpRecordMapper.selectList(tahelpRecordQueryWrapper);
+				e.setSuccessNum(helpRecordList.size());
 			}
 		});
 		pg.setRecords(list);

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

@@ -13,10 +13,12 @@ import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.entity.TdPosterTemplate;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import com.huiju.estateagents.service.ITaShareRecordService;
+import com.huiju.estateagents.service.ITdPosterTemplateService;
 import com.huiju.estateagents.service.TaPosterService;
 import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.models.auth.In;
@@ -62,6 +64,9 @@ public class TaShareActivityController extends BaseController {
     @Autowired
     private TaShareContentService taShareContentService;
     
+    @Autowired
+    private ITdPosterTemplateService tdPosterTemplateService;
+    
 
     /**
      * 分页查询列表
@@ -304,6 +309,13 @@ public class TaShareActivityController extends BaseController {
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
             map.put("postList",postList);
     
+            QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
+            tdPosterTemplateQueryWrapper.eq("org_id",orgId);
+            tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            tdPosterTemplateQueryWrapper.eq("type",CommConstant.GROUP_ACTIVITY);
+            List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);
+            map.put("posterTemplateList",posterTemplateList);
+    
             //获取分享信息
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);

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

@@ -120,4 +120,9 @@ public class HelpActivity implements Serializable {
     @TableField(exist = false)
     private String helpStatus;
 
+    /**
+     * 发起成功的总数
+     */
+    @TableField(exist = false)
+    private String succeedCount;
 }

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

@@ -24,6 +24,10 @@ public interface IMiniAppService {
     WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv, String appid);
 
     void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt);
+    
+    void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt);
+    
+    void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt);
 
     void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content);
 

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

@@ -11,7 +11,9 @@ import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.IMiniAppService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,12 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 	@Autowired
 	private HelpRecordMapper helpRecordMapper;
 	
+	@Autowired
+	private TaPersonMapper taPersonMapper;
+	
+	@Autowired
+	private IMiniAppService miniAppService;
+	
 	/**
 	 * 助力者助力
 	 *
@@ -57,13 +65,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		//查看是否助力成功
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
-			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
 		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
-			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
@@ -100,7 +108,8 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		helpRecord.setPersonId(person.getPersonId());
 		helpRecordMapper.insert(helpRecord);
 		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
-			//发送微信模板消息所有人都发送--todo
+			//发送微信模板消息所有人都发送
+			sendWxMessage(helpInitiateRecord,orgId,helpActivity);
 			
 			//生成核销码
 			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
@@ -117,5 +126,28 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		map.put("helpInitiateRecord",helpInitiateRecord);
 		return ResponseBean.success(map);
 	}
-
+	
+	/**
+	 * 发送微信消息
+	 * @param helpInitiateRecord
+	 * @param orgId
+	 * @param helpActivity
+	 */
+	private void sendWxMessage(HelpInitiateRecord helpInitiateRecord, Integer orgId, HelpActivity helpActivity) {
+		//发送给发起者
+		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());
+		//批量发送给助力者
+		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("org_id",orgId);
+		queryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+		queryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
+		List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
+		helpRecords.forEach(e -> {
+			TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
+			miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+		});
+	}
+	
 }

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

@@ -84,6 +84,26 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
         sendMessage("notice", toUser, link, data);
     }
+    
+    @Override
+    public void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
+        List<WxMaTemplateData> data = new ArrayList<>();
+        data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+        data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+        data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+        
+        sendMessage("help.result", toUser, link, data);
+    }
+    
+    @Override
+    public void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
+        List<WxMaTemplateData> data = new ArrayList<>();
+        data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+        data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+        data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+        
+        sendMessage("group.result", toUser, link, data);
+    }
 
     @Override
     public void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {

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

@@ -16,6 +16,7 @@ import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,8 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
     private TaShareActivityMapper activityMapper;
     @Autowired
     private TaShareRecordMapper tashareRecordmapper;
+    @Autowired
+    private IMiniAppService miniAppService;
 
     @Override
     public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
@@ -118,13 +121,13 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         //查看是否拼团成功
         TaShareRecord taShareRecord = tashareRecordmapper.selectById(taShareChildRecord.getRecordId());
         if (taShareRecord.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
-            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         
         //查看是否拼团成功
         TaShareActivity taShareActivity = activityMapper.selectById(taShareChildRecord.getGroupActivityId());
         if (taShareActivity.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
-            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
             return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
@@ -156,7 +159,8 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         taShareChildRecord.setPersonId(person.getPersonId());
         taShareChildRecordMapper.insert(taShareChildRecord);
         if (taShareActivity.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
-            //发送微信模板消息所有人都发送--todo
+            //发送微信模板消息所有人都发送
+            sendWxMessage(taShareRecord,orgId,taShareActivity);
             
             //生成团员核销码和改状态拼团成功
             changeChildRecord(taShareChildRecord.getRecordId(),orgId,taShareChildRecord.getGroupActivityId());
@@ -168,6 +172,30 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         return ResponseBean.success(taShareRecord);
     }
     
+    /**
+     * 发送微信消息
+     * @param taShareRecord
+     * @param orgId
+     * @param taShareActivity
+     */
+    private void sendWxMessage(TaShareRecord taShareRecord, Integer orgId, TaShareActivity taShareActivity) {
+        //发送给发起者
+        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());
+        //批量发送给助力者
+        QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
+        taShareChildRecordQueryWrapper.eq("org_id",orgId);
+        taShareChildRecordQueryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
+        taShareChildRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
+        List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
+        shareChildRecordList.forEach(e -> {
+            TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
+            miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+        });
+    }
+    
     /**
      * 更改团员状态和生成核销码
      * @param recordId

src/main/resources/mapper/HelpActivityMapper.xml

@@ -2,28 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.HelpActivityMapper">
     <select id="helpActivityListPage" resultType="com.huiju.estateagents.entity.HelpActivity">
-        select * from ta_help_activity
+        SELECT
+        COUNT(hir.verification) as succeedCount,
+        ha.*
+        FROM
+        ta_help_activity ha
+        LEFT JOIN ta_help_initiate_record hir ON ha.help_activity_id = hir.help_activity_id
+        AND (hir.verification is NULL or hir.verification != '')
         <where>
         <if test="cityId != null and cityId != ''">
-            and city_id = #{cityId}
+            and ha.city_id = #{cityId}
         </if>
         <if test="buildingId != null and buildingId != ''">
-            and building_id = #{buildingId}
+            and ha.building_id = #{buildingId}
         </if>
         <if test="title != null and title != ''">
-            and title = #{title}
+            and ha.title like CONCAT('%',#{title}, '%')
         </if>
         <if test="startDate != null and startDate != ''and startDate!='Invalid date'">
-         and date_format(start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
+         and date_format(ha.start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
         </if>
         <if test="endDate != null and endDate != ''and endDate!='Invalid date'">
-            and date_format(end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
+            and date_format(ha.end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
         </if>
         <if test="activityStatus != null and activityStatus != null">
-            and activity_status = #{activityStatus}
+            and ha.activity_status = #{activityStatus}
         </if>
-            and org_id=#{orgId}
+            and ha.org_id=#{orgId}
         </where>
+        GROUP BY ha.help_activity_id
+        order by ha.activity_status = 0 desc,ha.activity_status = 1 desc,ha.activity_status = 2 desc,ha.start_date desc
     </select>
 
     <update id="updateUnStartHelpActivity">