Merge remote-tracking branch 'origin/developer' into developer

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

@@ -1077,7 +1077,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //素材列表
         List<QywxMessageMaterialDTO> messageMaterialList = new ArrayList<>();
         materialIdList.forEach(materialId -> {
-            MaterialDTO material = materialApiService.selectMaterialById(materialId);
+            MaterialDTO material = materialApiService.getHasChangeMadieMaterialById(materialId);
             if (material == null) {
                 return;
             }
@@ -1120,7 +1120,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //企微对应的id
         String maerialId = material.getMediaId();
         //判断素材企微id是否需要刷新
-        List<Integer> materialTypeList = Arrays.asList(2, 4, 5, 6);
+        List<Integer> materialTypeList = Arrays.asList(2, 4, 6);
         if (materialTypeList.contains(materialType)) {
             Date wxLastTime = material.getWxLastUploadTime();
             if (DateUtil.addDay(wxLastTime, 3).getTime() < System.currentTimeMillis()) {
@@ -1129,7 +1129,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         //素材对象
         QywxMessageMaterialDTO dto = new QywxMessageMaterialDTO();
-        if (materialType == 2 || materialType == 5) {
+        if (materialType == 2) {
             QywxImageMaterialDTO imageMaterialDTO = new QywxImageMaterialDTO();
             imageMaterialDTO.setMediaId(maerialId);
             dto.setMsgType("image");