校验修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatActivityRewardDTO.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.dto.chat;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.google.common.base.Objects;
 
 import java.io.Serializable;
 import java.util.List;
@@ -89,5 +90,18 @@ public class GroupChatActivityRewardDTO implements Serializable {
     public void setDetailList(List<GroupChatActivityRewardDetailDTO> detailList) {
         this.detailList = detailList;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GroupChatActivityRewardDTO rewardDTO = (GroupChatActivityRewardDTO) o;
+        return Objects.equal(chatActivityId, rewardDTO.chatActivityId) && Objects.equal(inviteNumber, rewardDTO.inviteNumber) && Objects.equal(inviteLevel, rewardDTO.inviteLevel) && Objects.equal(rewardInvite, rewardDTO.rewardInvite) && Objects.equal(limitReward, rewardDTO.limitReward) && Objects.equal(detailList, rewardDTO.detailList);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(chatActivityId, inviteNumber, inviteLevel, rewardInvite, limitReward, detailList);
+    }
 }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatActivityRewardDetailDTO.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.dto.chat;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.google.common.base.Objects;
 
 import java.io.Serializable;
 
@@ -58,5 +59,18 @@ public class GroupChatActivityRewardDetailDTO implements Serializable {
     public void setRewardName(String rewardName) {
         this.rewardName = rewardName;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GroupChatActivityRewardDetailDTO that = (GroupChatActivityRewardDetailDTO) o;
+        return Objects.equal(rewardType, that.rewardType) && Objects.equal(rewardValue, that.rewardValue);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(rewardType, rewardValue);
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatActivityRewardLogServiceImpl.java

@@ -192,7 +192,7 @@ public class GroupChatActivityRewardLogServiceImpl implements GroupChatActivityR
                     TabGroupChatActivityRewardDetailLog rewardDetailLog = new TabGroupChatActivityRewardDetailLog();
                     Long rewardDetailId = UniqueIdUtils.uniqueLong();
                     rewardDetailLog.setChatActivityRewardDetailId(rewardDetailId);
-                    rewardDetailLog.setChatActivityRewardId(rewardDetailDTO.getChatActivityRewardId());
+                    rewardDetailLog.setChatActivityRewardId(rewardLogId);
                     rewardDetailLog.setChatActivityId(rewardDTO.getChatActivityId());
                     rewardDetailLog.setActivityRewardId(rewardDetailDTO.getChatActivityRewardId());
                     rewardDetailLog.setMemberId(memberId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatActivityServiceImpl.java

@@ -173,7 +173,7 @@ public class GroupChatActivityServiceImpl implements GroupChatActivityService {
                     throw new BusinessException("500", "活动已开始，奖励类型不支持编辑");
                 }
                 Map<Integer, List<GroupChatActivityRewardDTO>> oldRewardMap = activity.getRewardMap();
-                if (Objects.equals(oldRewardMap.size(), rewardMap.size())) {
+                if (!Objects.equals(oldRewardMap.size(), rewardMap.size())) {
                     throw new BusinessException("500", "活动已开始，奖励规则不支持编辑");
                 }
                 for(Map.Entry<Integer, List<GroupChatActivityRewardDTO>> entry : rewardMap.entrySet()){
@@ -188,7 +188,8 @@ public class GroupChatActivityServiceImpl implements GroupChatActivityService {
                     throw new BusinessException("500", "活动已开始，入群方式层级规则不支持编辑");
                 }
                 List<GroupChatActivityJoinDTO> oldJoinList = activity.getJoinList();
-                if (!CollUtil.isEqualList(oldJoinList, EntityUtil.changeEntityListNew(GroupChatActivityJoinDTO.class, joinList))) {
+                if (CollectionUtils.isNotEmpty(oldJoinList) && CollectionUtils.isNotEmpty(joinList) &&
+                        !CollUtil.isEqualList(oldJoinList, EntityUtil.changeEntityListNew(GroupChatActivityJoinDTO.class, joinList))) {
                     throw new BusinessException("500", "活动已开始，入群规则不支持编辑");
                 }
 

haoban-manage3-service/src/test/java/GroupChatTest.java

@@ -33,6 +33,8 @@ public class GroupChatTest {
     @Autowired
     private GroupChatActivityApiService groupChatActivityApiService;
     @Autowired
+    private GroupChatActivityService groupChatActivityService;
+    @Autowired
     private GroupChatActivityShareApiService groupChatActivityShareApiService;
     @Autowired
     private GroupChatActivityInviteLogService groupChatActivityInviteLogService;
@@ -116,6 +118,12 @@ public class GroupChatTest {
     }
 
     @Test
+    public void saveActivity2() throws Exception{
+        String s = "{\"activityDesc\":\"1、邀请好友进群获取奖励； \\n2、活动最终解释权归品牌方所有。\",\"activityImg\":\"https://platform-1251519181.cos.ap-shanghai.myqcloud.com/image/communityImgs/activity_img.png\",\"activityInviteImg\":\"https://platform-1251519181.cos.ap-shanghai.myqcloud.com/image/communityImgs/invite_img.png\",\"activityName\":\"定额\",\"activityPosterImg\":\"https://platform-1251519181.cos.ap-shanghai.myqcloud.com/image/communityImgs/poster_img.png\",\"activityShareImg\":\"https://platform-1251519181.cos.ap-shanghai.myqcloud.com/image/communityImgs/share_card.png\",\"activityShareTitle\":\"进群获取奖励，快来和我一起参加吧\",\"chatActivityId\":719604953596846379,\"creatorId\":\"fefd1c81641711e69d0818c58a146fd2\",\"creatorName\":\"达摩管理\",\"endDate\":1729699199000,\"enterpriseId\":\"ff8080815dacd3a2015dacd3ef5c0000\",\"exceptionNotice\":0,\"inviteMemberType\":1,\"inviteRewardType\":1,\"inviteType\":0,\"joinChatHmId\":718110997637776598,\"joinList\":[],\"joinRule\":\"[{\\\"openFlag\\\":1,\\\"val\\\":1},{\\\"openFlag\\\":1,\\\"val\\\":2},{\\\"openFlag\\\":0,\\\"val\\\":3},{\\\"openFlag\\\":0,\\\"val\\\":4}]\",\"joinType\":1,\"labelFlag\":0,\"labelJson\":\"\",\"rewardMap\":{1:[{\"chatActivityId\":719604953596846379,\"detailList\":[{\"chatActivityRewardId\":719604953735258412,\"rewardName\":\"[{\\\"name\\\":\\\"1积分\\\"}]\",\"rewardType\":1,\"rewardValue\":\"1\"}],\"inviteLevel\":1,\"inviteNumber\":1,\"limitReward\":1,\"rewardInvite\":1}],2:[{\"chatActivityId\":719604953596846379,\"detailList\":[{\"chatActivityRewardId\":719604953861087533,\"rewardName\":\"[{\\\"name\\\":\\\"1积分\\\"}]\",\"rewardType\":1,\"rewardValue\":\"1\"},{\"chatActivityRewardId\":719604953873670446,\"rewardName\":\"[{\\\"name\\\":\\\"1成长值\\\"}]\",\"rewardType\":2,\"rewardValue\":\"1\"}],\"inviteLevel\":1,\"inviteNumber\":1,\"limitReward\":1,\"rewardInvite\":2}]},\"startDate\":1729008000000,\"wxEnterpriseId\":\"ca66a01b79474c40b3e7c7f93daf1a3b\"}";
+        groupChatActivityService.saveActivity(JSONObject.parseObject(s,GroupChatActivityQDTO.class));
+    }
+
+    @Test
     public void listGroupChatHm() throws Exception{
         GroupChatActivityHmQDTO groupChatActivityHmQDTO = new GroupChatActivityHmQDTO();
         groupChatActivityHmQDTO.setChatActivityId(716721754221821953L);