Merge branch 'feature/xgh/20241月迭代' into 'developer'

Feature/xgh/20241月迭代

See merge request !1681

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

@@ -52,8 +52,18 @@ public class MemberUnionidRelatedDTO implements Serializable{
 
     private String wxUserId ;
 
+    private int retryTimes ;
+
     private boolean isFlush = false  ;
 
+    public int getRetryTimes() {
+        return retryTimes;
+    }
+
+    public void setRetryTimes(int retryTimes) {
+        this.retryTimes = retryTimes;
+    }
+
     public String getWxUserId() {
         return wxUserId;
     }

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

@@ -50,7 +50,17 @@ public class QwFrientNoticeDTO implements Serializable {
     private String changeType;
     // 是否从自建应用下的回调
     private int selfCallback = 0;
-    
+
+    private int retryTimes ;
+
+    public int getRetryTimes() {
+        return retryTimes;
+    }
+
+    public void setRetryTimes(int retryTimes) {
+        this.retryTimes = retryTimes;
+    }
+
     public int getSelfCallback() {
         return selfCallback;
     }

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

@@ -836,7 +836,7 @@ public class GroupChatServiceImpl implements GroupChatService {
         hbUser.setGroupChatId(groupChatId);
         hbUser.setUserId(userId);
         hbUser.setJoinScene(qwUser.getJoin_scene());
-        hbUser.setJoinState(null);
+        hbUser.setJoinState(qwUser.getState());
         hbUser.setUnionid(qwUser.getUnionid());
         hbUser.setDeleteFlag(0);
         hbUser.setStatusFlag(1);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -926,7 +926,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             } else if ("1".equals(unionIdJson)) {
                 log.info("接口调用被限制");
                 dto.setWxUserId(wxUserId);
-                this.qywxErrorLogService.addFriendErrLog(wxEnterpriseId,JSONObject.toJSONString(dto),4,dto.getExternalUserid());
+                dto.setRetryTimes(dto.getRetryTimes()+1);
+                if(dto.getRetryTimes()<=3) {
+                    this.qywxErrorLogService.addFriendErrLog(wxEnterpriseId, JSONObject.toJSONString(dto), 4, dto.getExternalUserid());
+                }
                 HBQwMonitorUtils.addForFriend(1);
                 throw new WxApiLimitException("getCorpSelfExternalUseridInfo接口调用被限制");
             }