Merge branch 'feature/xgh/202503' into 'master'

Feature/xgh/202503

See merge request !2838

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

@@ -314,6 +314,8 @@ public class MaterialServiceImpl implements MaterialService {
                 String md5 = null ;
                 if(type==7) {
                     md5 = Md5Util.MD5(imageUrl + type + dto.getCanvasCouponUUID()+dto.getMaterialTitle());
+                }else if(type==6){
+                    md5 = Md5Util.MD5(imageUrl + type + dto.getMaterialTitle());
                 }else {
                     md5 = Md5Util.MD5(imageUrl+type);
                 }

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

@@ -246,6 +246,9 @@ public class QywxSendServiceImpl implements QywxSendService {
         } else if (materialType == 6 || materialType == 7) {
             QywxMiniprogramMaterialDTO miniprogramMaterialDTO = new QywxMiniprogramMaterialDTO();
             miniprogramMaterialDTO.setTitle(material.getMaterialTitle());
+            if(null != miniprogramMaterialDTO.getTitle() && miniprogramMaterialDTO.getTitle().getBytes().length>64) {
+                miniprogramMaterialDTO.setTitle(miniprogramMaterialDTO.getTitle().substring(0, 20));
+            }
             miniprogramMaterialDTO.setPicMediaId(maerialId);
             miniprogramMaterialDTO.setAppid(material.getAppId());
             miniprogramMaterialDTO.setPage(material.getLink());