Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AchievementDetailResultDTO.java

@@ -33,5 +33,9 @@ public class AchievementDetailResultDTO implements Serializable {
 		 * 成就描述（分拼在一起）
 		 */
 		private String describe;
+		/**
+		 * 是否达成 0，1
+		 */
+		private Integer isArrive;
 	}
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -1236,6 +1236,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean();
 				String describe = item.getAchievementName() + "(" + item.getCurrentValue().toString() + "/" + item.getTargetValue().toString() + ")";
 				bean.setDescribe(describe);
+				bean.setIsArrive(item.getIsArrive());
 				achievementList.add(bean);
 			});
 		}
@@ -1246,6 +1247,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean();
 				bean.setDescribe(item.getAchievementName());
 				bean.setCompletionDate(DateUtils.dateToTimestamp(item.getArriveTime()));
+				bean.setIsArrive(item.getIsArrive());
 				achievementList.add(bean);
 			});
 		}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
@@ -33,8 +34,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.IssueShareLinkVisitRecordDTO;
-import com.epmet.dto.form.*;
 import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -43,6 +44,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
+import com.epmet.modules.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
@@ -77,6 +79,7 @@ import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO;
 import com.epmet.resi.group.dto.member.result.GridVotableCountResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
 import com.epmet.resi.group.dto.member.result.VotableCountResultDTO;
+import com.epmet.send.SendMqMsgUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -688,6 +691,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
 		msgList.add(wxSubscribeMessageFormDTO);
 		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
+		//发送小组成就消息
+		boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendGroupAchievementMqMsg(new GroupAchievementMQMsg(resiGroupMemberDTO.getCustomerId(), resiGroupMemberDTO.getResiGroupId(), AchievementTypeEnum.MEMBER.getCode()));
+		if (!flag) {
+			logger.error("发送(小组成就)系统消息到message服务失败");
+		}
 	}
 
 	/**

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml

@@ -25,7 +25,8 @@
             ACHIEVEMENT_ID,
             ACHIEVEMENT_NAME,
             CURRENT_VALUE,
-            TARGET_VALUE
+            TARGET_VALUE,
+            IS_ARRIVE
         FROM
             resi_group_achievement_stats
         WHERE DEL_FLAG = '0'