Merge branch 'feature/xgh/20250609' into 'developer'

Feature/xgh/20250609

See merge request !2956

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

@@ -268,7 +268,7 @@ public class MaterialServiceImpl implements MaterialService {
               }
               jp = qywxSuiteApiService.uploadAttachment(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), url, arr[count - 1], fileType.getCode() , selfFlag , qwDTO.getUrlHost());
           }else {
-              int i = 1/0 ;
+              int  i = 1/0 ;
               // 群发上传
               if(!url.contains("?")) {
                   if(type == 2) {

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

@@ -568,6 +568,12 @@ public class MaterialApiServiceImpl implements MaterialApiService {
 
     @Override
     public List<String> getImageMediaId(String wxEnterpriseId, List<ContentMaterialDTO> imageList, int mediaType) {
-        return this.materialService.getImageMediaId(wxEnterpriseId, imageList, mediaType);
+        List<String> list = this.materialService.getImageMediaId(wxEnterpriseId, imageList, mediaType);
+        if(CollectionUtils.isNotEmpty(list)) {
+            list.forEach(materialId -> {
+                materialService.getHasChangeMadieMaterialById(materialId, 2);
+            }) ;
+        }
+        return list ;
     }
 }

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

@@ -780,7 +780,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             this.updateMemberGrowth(enterpriseId,memberId,clerkId);
         }
         String storeId = staffClerkRelationDTO.getStoreId();
-        this.saveExternalClerk(memberId, staffId, dto, staffClerkRelationDTO , 1);
+        this.saveExternalClerk(memberId, staffId, dto, staffClerkRelationDTO , 1 , 0);
         // this.sendWelcome(dto, qwDTO, enterpriseId, staffId, clerkId,memberId);
         //同步好友标签
         this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,null);
@@ -812,7 +812,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         addDelFriendEvent(unionId, clerkId, wxEnterpriseId, enterpriseId, memberId, storeId, 1 , externalUserid,bo.isNewFlag());
         return memberId;
     }
-    private void saveExternalClerk(String memberId ,String staffId , MemberUnionidRelatedDTO dto , StaffClerkRelationDTO staffClerkRelation , int status) {
+    private void saveExternalClerk(String memberId ,String staffId , MemberUnionidRelatedDTO dto , StaffClerkRelationDTO staffClerkRelation , int status , int isFlush) {
         String wxEnterpriseId = dto.getWxEnterpriseId() ;
         String externalUserid = dto.getExternalUserid();
         String relationKey = SecureUtil.md5(staffId + externalUserid);
@@ -854,7 +854,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             if(exsitDTO.getStatusFlag()==1) {
                 if(StringUtils.isEmpty(exsitDTO.getSelfExternalUserid())) {
                     exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserid());
-                    exsitDTO.setExternalStatus(1);
+                    if(isFlush==1) {
+                        if(null == exsitDTO.getExternalStatus() || exsitDTO.getExternalStatus() !=3) {
+                            exsitDTO.setExternalStatus(1);
+                        }
+                    }else {
+                        exsitDTO.setExternalStatus(1);
+                    }
                     this.externalClerkRelatedService.update(exsitDTO);
                 }
               /*  if(!dto.isFlush()) {
@@ -976,7 +982,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //发送欢迎语
         // sendWelcome(dto, qwDTO, enterpriseId, staffId, clerkId,null);
         //保存好友关系
-        this.saveExternalClerk(null, staffId, dto, staffClerkRelationDTO, 4);
+        this.saveExternalClerk(null, staffId, dto, staffClerkRelationDTO, 4 , 0);
     }
     /**
      * 组装数据
@@ -1582,7 +1588,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if(StringUtils.isBlank(memberId)) {
             statusFlag = 3 ;
         }
-        this.saveExternalClerk(memberId, staffId, unionDTO, staffClerkRelation, statusFlag);
+        this.saveExternalClerk(memberId, staffId, unionDTO, staffClerkRelation, statusFlag , 1);
         if(StringUtils.isNotBlank(memberId)) {
             if(null == RedisUtil.getCache("zhuan_self")) {
                 this.pushTagSync(memberId, wxEnterpriseId, enterpriseId,dto.getExternalUseridInfo());