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

小程序图标

See merge request !3030

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

@@ -45,8 +45,19 @@ public class MaterialDTO implements Serializable{
     //appid  link路径  img_url 封面图 materialTitle
     private String appId;
 
+    // 小程序卡片时，小程序的头像
+    private String headImg ;
+
     private static final long serialVersionUID = 1L;
 
+    public String getHeadImg() {
+        return headImg;
+    }
+
+    public void setHeadImg(String headImg) {
+        this.headImg = headImg;
+    }
+
     public String getMediaid() {
         return mediaid;
     }

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

@@ -335,24 +335,29 @@ public class MaterialApiServiceImpl implements MaterialApiService {
         }
         PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
         com.github.pagehelper.Page<TabHaobanMaterial> page = materialService.listMaterial(wxEnterpriseId, keyword, categoryIds, materialType);
-        List<TabHaobanMaterial> result = page.getResult();
         List<TabMiniprogramSetting> settings = miniprogramSettingService.listMiniprogram(wxEnterpriseId);
-        if (CollectionUtils.isNotEmpty(result) && CollectionUtils.isNotEmpty(settings)) {
+        Page<MaterialDTO> retPage = PageUtil.changePageHelperToCurrentPage(page, MaterialDTO.class);
+        if (CollectionUtils.isNotEmpty(retPage.getResult()) && CollectionUtils.isNotEmpty(settings)) {
             Map<String, TabMiniprogramSetting> settingMap = settings.stream()
                     .collect(Collectors.toMap(
                             TabMiniprogramSetting::getAppId,
                             Function.identity(),
                             (a, b) -> a
                     ));
-            result.forEach(dto -> {
+            retPage.getResult().forEach(dto -> {
                 //小程序去判断逻辑
                 if (dto.getMaterialType() != null && dto.getMaterialType() == 6) {
                     TabMiniprogramSetting miniprogramSetting = settingMap.get(dto.getAppId());
-                    dto.setMaterialDesc(miniprogramSetting == null ? "--" : miniprogramSetting.getMiniprogramName());
+                    if(null != miniprogramSetting) {
+                        dto.setMaterialDesc(miniprogramSetting.getMiniprogramName());
+                        dto.setHeadImg(miniprogramSetting.getImageUrl());
+                    }else {
+                        dto.setMaterialContent("--");
+                    }
                 }
             });
         }
-        return PageUtil.changePageHelperToCurrentPage(page, MaterialDTO.class);
+        return retPage ;
     }
 
     @Override

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

@@ -35,9 +35,9 @@ public class TagSyncTest {
     // com.gic.haoban.manage.service.service.out.impl.QywxTagApiServiceImpl.syncQywxTagToGicByExternalUserId
     @Test
     public void test1() {
-         String wxEnterpriseId = "b18ffdc9d0644912865a248859914d80" ;
-         String externalUserId = "wm59NLDQAAhf0x3cc8FLo4wxYBWZtVYw"  ;
-         String wxUserId = "wo59NLDQAAf5VM3RJ04BBznuqq2M3K3g" ;
+         String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b" ;
+         String externalUserId = "wm59NLDQAAdcT6u5mqXz_jeMN9CpgXuw"  ;
+         String wxUserId = "wo59NLDQAACLAXbOdqrz-70qpl72cWcA" ;
          this.qywxTagApiService.syncQywxTagToGicByExternalUserId(wxEnterpriseId,externalUserId,wxUserId,null) ;
 
     }